| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | 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 | |||||
| | * | | | | | | | Fix specmr-builds | Douwe Maan | 2015-12-08 | 1 | -1/+1 | |
| | | |_|_|_|/ / | |/| | | | | | ||||||
| * | | | | | | | Merge branch 'edit-in-patch-branch' into 'master' | Robert Speicher | 2015-12-08 | 2 | -10/+0 | |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default target branch to patch-n when editing file in protected branch Fixes #3441 See merge request !2021 | |||||
| | * | | | | | | Fix spec | Douwe Maan | 2015-12-08 | 2 | -10/+0 | |
| | | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | | Merge branch 'languages-graph' into 'master' | Robert Speicher | 2015-12-08 | 2 | -0/+14 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | Languages graph See merge request !2009 | |||||
| | * | | | | | Add tests and changelog item for language graphslanguages-graph | Dmitriy Zaporozhets | 2015-12-08 | 2 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | | | | | Merge branch 'serve_lfs_object' into 'master' | Douwe Maan | 2015-12-08 | 2 | -0/+33 | |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976 | |||||
| | * | | | | | Fix specs caused by update of gitlab-test repo.serve_lfs_object | Marin Jankovski | 2015-12-08 | 1 | -0/+1 | |
| | | | | | | | ||||||
| | * | | | | | Add specs for showing lfs object in UI. | Marin Jankovski | 2015-12-07 | 2 | -0/+32 | |
| | | |_|/ / | |/| | | | ||||||
| * | | | | | Add custom ColorValidator | Robert Speicher | 2015-12-07 | 2 | -2/+2 | |
| | |/ / / |/| | | | ||||||
| * | | | | Merge branch 'fix-random-failing-test' into 'master' | Dmitriy Zaporozhets | 2015-12-07 | 2 | -2/+8 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix random failing test Make sure we wait till page reloads after request was merged. Otherwise we get request running which fails next test Improvement for !1897 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2004 | |||||
| | * | | | | Fix random failing test | Dmitriy Zaporozhets | 2015-12-07 | 2 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we wait till page reloads after request was merged. Otherwise we get request running which fails next test Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | | | | Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ce | Dmitriy Zaporozhets | 2015-12-07 | 1 | -3/+1 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| | * | | | | Fix spec | Stan Hu | 2015-12-04 | 1 | -3/+1 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' | Grzegorz Bizon | 2015-12-07 | 4 | -13/+47 | |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problems with award-emoji-only comment This fixes a conflict between note with only a single emoji in content and award-emojis mechanisms. Closes #3734 cc @vsizov See merge request !1936 | |||||
| | * | | | | Add feature test for emoji-only diff notes | Grzegorz Bizon | 2015-12-03 | 2 | -0/+23 | |
| | | | | | | | | | | | | | | | | | | | | | This specs is related to bug described in #3734 (award-emojis). | |||||
| | * | | | | Add test for award-emoji being added as regular comment | Grzegorz Bizon | 2015-12-03 | 2 | -13/+24 | |
| | | |/ / | |/| | | ||||||
| * | | | | Ensure "Remove Source Branch" button is not shown when branch is being ↵ | Rubén Dávila | 2015-12-04 | 2 | -0/+52 | |
| | |/ / |/| | | | | | | | | deleted. #3583 | |||||
| * | | | Merge remote-tracking branch 'origin/ui/issuable-form' | Dmitriy Zaporozhets | 2015-12-04 | 2 | -3/+2 | |
| |\ \ \ | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | | Fix specsui/issuable-form | Douwe Maan | 2015-12-03 | 2 | -2/+2 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' into ui/issuable-form | Douwe Maan | 2015-12-03 | 4 | -8/+8 | |
| | |\ \ \ | | |/ / | ||||||
| | * | | | Don't reset target branch when choosing to "Change branches" in MR | Douwe Maan | 2015-12-02 | 1 | -1/+0 | |
| | | |/ | |/| | ||||||
| * | | | Merge branch 'ui/form-consistency' into 'master' | Dmitriy Zaporozhets | 2015-12-04 | 6 | -19/+19 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Improve form consistency Depends on !1953 See the commits for more details, the messages mostly speak for themselves. # Highlights ## Tag form Before:  After:  See merge request !1955 | |||||
| | * | | | Fix specui/form-consistency | Douwe Maan | 2015-12-03 | 1 | -4/+4 | |
| | | | | | ||||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |