| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | Add JS validation for invalid characters in branch name | Douglas Barbosa Alexandre | 2015-12-17 | 2 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More info about valid ref names: https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.ht ml | |||||
| | | * | | | | | Add more descriptive error message when create branch with invalid name | Douglas Barbosa Alexandre | 2015-12-16 | 1 | -1/+1 | |
| | | | |/ / / | | |/| | | | ||||||
| | * | | | | | Merge branch 'issue_4189' into 'master' | Douwe Maan | 2015-12-24 | 2 | -0/+12 | |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix redirect to wrong URL when merging and MR detail URL has an anchor. Closes #4189 See merge request !2169 | |||||
| | | * | | | | Fix redirect to wrong URL when merging and MR detail URL has an anchor. #4189issue_4189 | Rubén Dávila | 2015-12-21 | 2 | -0/+12 | |
| | | | | | | | ||||||
| * | | | | | | fixes after review | Valery Sizov | 2015-12-24 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | emoji picker search | Valery Sizov | 2015-12-23 | 2 | -0/+18 | |
| |/ / / / / | ||||||
| * | | | | | add some spinach | Valery Sizov | 2015-12-22 | 2 | -0/+12 | |
| | | | | | | ||||||
| * | | | | | fix specs | Valery Sizov | 2015-12-22 | 1 | -2/+2 | |
| |/ / / / | ||||||
| * | | | | Backport JIRA service | Drew Blessing | 2015-12-18 | 2 | -0/+24 | |
| | |/ / |/| | | ||||||
| * | | | Upgrade Poltergeist to 1.8.1. #4131issue_4131 | Rubén Dávila | 2015-12-17 | 2 | -2/+3 | |
| |/ / | ||||||
| * | | Fix specfix-milestone-snippet-header | Douwe Maan | 2015-12-16 | 1 | -1/+1 | |
| | | | ||||||
| * | | Rename .issuable-details to .detail-page (and -header and -description) | Douwe Maan | 2015-12-16 | 2 | -3/+3 | |
| | | | ||||||
| * | | Merge branch 'master' into fix-milestone-snippet-header | Douwe Maan | 2015-12-16 | 7 | -23/+23 | |
| |\ \ | ||||||
| | * \ | Merge remote-tracking branch 'origin/feature/update-rubocop' | Dmitriy Zaporozhets | 2015-12-16 | 7 | -23/+23 | |
| | |\ \ | ||||||
| | | * | | Fixed Rubocop offenses | Gabriel Mazetto | 2015-12-15 | 7 | -23/+23 | |
| | | | | | ||||||
| * | | | | Fix tests | Douwe Maan | 2015-12-16 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Add spinach test for note polling | Grzegorz Bizon | 2015-12-15 | 3 | -1/+17 | |
| | |/ |/| | | | | | | | This also increases capybara timeout to 15 seconds (note polling interval). Capybara will look for new note for this period of time. | |||||
| * | | Preserve trailing new lines at the end of file on the online editor | Douglas Barbosa Alexandre | 2015-12-14 | 2 | -0/+19 | |
| |/ | | | | | Because Haml automatically indents the HTML source code, the contents of whitespace-sensitive tags like pre and textarea can get screwed up. | |||||
| * | Update commits spinach tests related to displaying build status | Grzegorz Bizon | 2015-12-14 | 2 | -1/+6 | |
| | | ||||||
| * | Merge branch 'ci-project-migrate' into 'master' | Kamil Trzciński | 2015-12-14 | 5 | -19/+3 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci Project migrate - This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`. - This requires offline migrations. - It simplifies database models making all CI objects to be attached to: Project. - It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers). - We should add default `timeout` to Application Settings. - It misses specs. - It is based on ci-services-migrate for now. - It removes CI events. - It removes administrator CI projects overview. - It removes CI application settings. In 8.4 or 8.5 we can remove redundant tables and columns. See merge request !1987 | |||||
| | * | Migrate CI::Project to Project | Kamil Trzcinski | 2015-12-11 | 5 | -19/+3 | |
| | | | ||||||
| * | | Merge branch 'ci-services-migrate' into 'master' | Kamil Trzciński | 2015-12-14 | 1 | -0/+2 | |
| |\ \ | |/ | | | | | | | | | | | Ci Services migrate See merge request !1985 | |||||
| | * | Fix specs | Kamil Trzcinski | 2015-12-10 | 2 | -8/+8 | |
| | | | ||||||
| | * | Migrate CI::Services and CI::WebHooks to Services and WebHooks | Kamil Trzcinski | 2015-12-10 | 3 | -8/+10 | |
| | | | ||||||
| * | | Remove note from MR discussion when deleting it in the changes tab | Douglas Barbosa Alexandre | 2015-12-10 | 2 | -0/+29 | |
| | | | ||||||
| * | | Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' | Robert Speicher | 2015-12-10 | 2 | -0/+35 | |
| |\ \ | |/ |/| | | | | | | | | | Fix editing notes on a merge request diff Fixes #3910 See merge request !2041 | |||||
| | * | Merge branch 'master' into fix-edit-notes-on-merge-request-diff | Douglas Barbosa Alexandre | 2015-12-09 | 23 | -3/+146 | |
| | |\ | ||||||
| | * | | Ensure notes are replaced on a merge request diff when they're updated | Douglas Barbosa Alexandre | 2015-12-09 | 2 | -0/+35 | |
| | | | | ||||||
| * | | | Merge branch 'move-network' | Dmitriy Zaporozhets | 2015-12-09 | 3 | -10/+12 | |
| |\ \ \ | ||||||
| | * | | | Fix test for network shortcutmove-network | Dmitriy Zaporozhets | 2015-12-09 | 3 | -5/+6 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | | Move Network page from separate tab to sub tab of Commits | Dmitriy Zaporozhets | 2015-12-09 | 3 | -9/+10 | |
| | |/ / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | | Merge remote-tracking branch 'origin/mr-broken' | Dmitriy Zaporozhets | 2015-12-09 | 2 | -2/+2 | |
| |\ \ \ | |_|/ |/| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | Merge branch 'master' into mr-broken | Douwe Maan | 2015-12-08 | 2 | -0/+14 | |
| | |\ \ | | | | | | | | | | | | | | | | | # Conflicts: # app/helpers/ci_status_helper.rb | |||||
| | * | | | Use "Build passed" in tooltip instead of "Build status: passed" | Douwe Maan | 2015-12-08 | 2 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge branch 'rs-default-clone-fixes' into 'master' | Robert Speicher | 2015-12-09 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Simplify shared User SSH key steps See merge request !2043 | |||||
| | * | | | | Simplify shared User SSH key steps | Robert Speicher | 2015-12-09 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'split-up-builds' into 'master' | Dmitriy Zaporozhets | 2015-12-09 | 13 | -1/+13 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Split up 20min+ `spec:other` and `spinach:project` builds to increase parallelization See merge request !2036 | |||||
| | * | | | | Tag feature specs | Douwe Maan | 2015-12-09 | 13 | -1/+13 | |
| | | |_|/ | |/| | | ||||||
| * | | | | Merge branch 'default_clone_protocol_based_on_user_keys' into 'master' | Robert Speicher | 2015-12-09 | 5 | -2/+31 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rendering the clone page, check user profile to decide default clone protocol If the user has uploaded SSH-keys, use SSH; otherwise, use http(s). Closes #3504. See merge request !1998 | |||||
| | * \ \ \ | Merge branch 'master' into default_clone_protocol_based_on_user_keys | Eirik Lygre | 2015-12-09 | 14 | -31/+106 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | * | | | | Move ssh-key steps into SharedUser. Change references in "Explore Projects" ↵ | Eirik Lygre | 2015-12-09 | 5 | -10/+14 | |
| | | | | | | | | | | | | | | | | | | | | | feature. Apply ssh-key requirement to "Project Create" feature. | |||||
| | * | | | | Add spinach tests for the clone protocol selection. | Eirik Lygre | 2015-12-09 | 2 | -2/+27 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'fix-admin-should-be-able-to-add-himself-to-group' into 'master' | Dmitriy Zaporozhets | 2015-12-09 | 5 | -0/+102 | |
| |\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed in Admin can add/remove himself to a group/project Fixes #3640 /cc @JobV Could you have a look as well? See merge request !1942 | |||||
| | * | | | | Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-group | Douglas Barbosa Alexandre | 2015-12-08 | 9 | -20/+58 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-group | Douglas Barbosa Alexandre | 2015-12-04 | 10 | -33/+84 | |
| | |\ \ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | * | | | | | Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-group | Douglas Barbosa Alexandre | 2015-12-03 | 4 | -8/+8 | |
| | |\ \ \ \ \ | ||||||
| | * | | | | | | Signed in admin should be able to add/remove himself to a project | Douglas Barbosa Alexandre | 2015-12-01 | 2 | -0/+53 | |
| | | | | | | | | ||||||
| | * | | | | | | Signed in admin should be able to add/remove himself to a group | Douglas Barbosa Alexandre | 2015-12-01 | 3 | -0/+49 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'mr-builds' into 'master' | Dmitriy Zaporozhets | 2015-12-09 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Builds tab to MR detail page ## Before  ## After  Fixes #3907 See merge request !2016 | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into mr-builds | Douwe Maan | 2015-12-08 | 4 | -0/+47 | |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/views/projects/merge_requests/widget/_heading.html.haml | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |