summaryrefslogtreecommitdiff
path: root/features
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' Robert Speicher2015-12-102-0/+35
|\
| * Merge branch 'master' into fix-edit-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-0923-3/+146
| |\
| * | Ensure notes are replaced on a merge request diff when they're updatedDouglas Barbosa Alexandre2015-12-092-0/+35
* | | Merge branch 'move-network'Dmitriy Zaporozhets2015-12-093-10/+12
|\ \ \
| * | | Fix test for network shortcutmove-networkDmitriy Zaporozhets2015-12-093-5/+6
| * | | Move Network page from separate tab to sub tab of CommitsDmitriy Zaporozhets2015-12-093-9/+10
| |/ /
* | | Merge remote-tracking branch 'origin/mr-broken'Dmitriy Zaporozhets2015-12-092-2/+2
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into mr-brokenDouwe Maan2015-12-082-0/+14
| |\ \
| * | | Use "Build passed" in tooltip instead of "Build status: passed"Douwe Maan2015-12-082-2/+2
* | | | Merge branch 'rs-default-clone-fixes' into 'master' Robert Speicher2015-12-091-2/+2
|\ \ \ \
| * | | | Simplify shared User SSH key stepsRobert Speicher2015-12-091-2/+2
* | | | | Merge branch 'split-up-builds' into 'master' Dmitriy Zaporozhets2015-12-0913-1/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Tag feature specsDouwe Maan2015-12-0913-1/+13
| | |_|/ | |/| |
* | | | Merge branch 'default_clone_protocol_based_on_user_keys' into 'master' Robert Speicher2015-12-095-2/+31
|\ \ \ \
| * \ \ \ Merge branch 'master' into default_clone_protocol_based_on_user_keysEirik Lygre2015-12-0914-31/+106
| |\ \ \ \ | | |/ / /
| * | | | Move ssh-key steps into SharedUser. Change references in "Explore Projects" f...Eirik Lygre2015-12-095-10/+14
| * | | | Add spinach tests for the clone protocol selection.Eirik Lygre2015-12-092-2/+27
* | | | | Merge branch 'fix-admin-should-be-able-to-add-himself-to-group' into 'master' Dmitriy Zaporozhets2015-12-095-0/+102
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-groupDouglas Barbosa Alexandre2015-12-089-20/+58
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-groupDouglas Barbosa Alexandre2015-12-0410-33/+84
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-groupDouglas Barbosa Alexandre2015-12-034-8/+8
| |\ \ \ \ \
| * | | | | | Signed in admin should be able to add/remove himself to a projectDouglas Barbosa Alexandre2015-12-012-0/+53
| * | | | | | Signed in admin should be able to add/remove himself to a groupDouglas Barbosa Alexandre2015-12-013-0/+49
* | | | | | | Merge branch 'mr-builds' into 'master' Dmitriy Zaporozhets2015-12-091-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into mr-buildsDouwe Maan2015-12-084-0/+47
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Fix specmr-buildsDouwe Maan2015-12-081-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'edit-in-patch-branch' into 'master' Robert Speicher2015-12-082-10/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix specDouwe Maan2015-12-082-10/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'languages-graph' into 'master' Robert Speicher2015-12-082-0/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add tests and changelog item for language graphslanguages-graphDmitriy Zaporozhets2015-12-082-0/+14
* | | | | | Merge branch 'serve_lfs_object' into 'master' Douwe Maan2015-12-082-0/+33
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix specs caused by update of gitlab-test repo.serve_lfs_objectMarin Jankovski2015-12-081-0/+1
| * | | | | Add specs for showing lfs object in UI.Marin Jankovski2015-12-072-0/+32
| | |_|/ / | |/| | |
* | | | | Add custom ColorValidatorRobert Speicher2015-12-072-2/+2
| |/ / / |/| | |
* | | | Merge branch 'fix-random-failing-test' into 'master' Dmitriy Zaporozhets2015-12-072-2/+8
|\ \ \ \
| * | | | Fix random failing testDmitriy Zaporozhets2015-12-072-2/+8
* | | | | Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ceDmitriy Zaporozhets2015-12-071-3/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix specStan Hu2015-12-041-3/+1
* | | | | Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' Grzegorz Bizon2015-12-074-13/+47
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add feature test for emoji-only diff notesGrzegorz Bizon2015-12-032-0/+23
| * | | | Add test for award-emoji being added as regular commentGrzegorz Bizon2015-12-032-13/+24
| | |/ / | |/| |
* | | | Ensure "Remove Source Branch" button is not shown when branch is being delete...Rubén Dávila2015-12-042-0/+52
| |/ / |/| |
* | | Merge remote-tracking branch 'origin/ui/issuable-form'Dmitriy Zaporozhets2015-12-042-3/+2
|\ \ \
| * | | Fix specsui/issuable-formDouwe Maan2015-12-032-2/+2
| * | | Merge branch 'master' into ui/issuable-formDouwe Maan2015-12-034-8/+8
| |\ \ \ | | |/ /
| * | | Don't reset target branch when choosing to "Change branches" in MRDouwe Maan2015-12-021-1/+0
| | |/ | |/|
* | | Merge branch 'ui/form-consistency' into 'master' Dmitriy Zaporozhets2015-12-046-19/+19
|\ \ \
| * | | Fix specui/form-consistencyDouwe Maan2015-12-031-4/+4
| * | | Fix specsDouwe Maan2015-12-032-5/+5
| * | | Merge branch 'master' into ui/form-consistencyDouwe Maan2015-12-034-8/+8
| |\ \ \ | | | |/ | | |/|
View Lorry Controller Status