summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesGrzegorz Bizon2016-10-121-0/+51
|\
| * Added link to bulk assign issues to MR author. (Issue #18876)James2016-10-061-0/+51
* | Add test that checks actual merge for MWBS featureGrzegorz Bizon2016-10-071-2/+13
* | Improve merge when builds succeeds specs readabilityGrzegorz Bizon2016-10-071-16/+28
|/
* Merge branch 'master' into revert-c676283bPhil Hughes2016-10-041-5/+50
|\
| * Add a /wip slash commandThomas Balthazar2016-10-031-5/+50
* | Merge branch 'master' into revert-c676283bPhil Hughes2016-10-034-13/+196
|\ \ | |/
| * Merge branch '22773-add-comparison-link-to-system-note' into 'master' Dmitriy Zaporozhets2016-10-031-6/+13
| |\
| | * Remove duplicate testMatthewRDodds/gitlab-ce-22773-add-comparison-link-to-system-noteMatthew Dodds2016-10-011-4/+0
| | * Add a spec to verify comparison context inclusion in path when a version is c...Matthew Dodds2016-10-011-2/+13
| * | Small improvements thanks to Robert's feedbackRémy Coutable2016-09-301-15/+3
| * | Take filters in account in issuable countersRémy Coutable2016-09-301-0/+15
| |/
| * Shush rubocop.Bryce Johnson2016-09-141-1/+0
| * Style merge request diff dropdowns & disable comments.Bryce Johnson2016-09-141-3/+12
| * Move write_note into SlashCommandsHelper and update other dependent specsslash-commands-issuable-spec-fixStan Hu2016-09-081-4/+6
| * Merge branch 'dz-bulk-edit-mr' into 'master' Rémy Coutable2016-09-081-0/+132
| |\
| | * Refactor code for bulk update merge requests featuredz-bulk-edit-mrDmitriy Zaporozhets2016-09-081-17/+30
| | * Refactor merge requests bulk update specDmitriy Zaporozhets2016-09-081-52/+60
| | * Make merge requests bulk update workingDmitriy Zaporozhets2016-09-081-0/+111
| * | Improve merge request version featureDmitriy Zaporozhets2016-09-071-5/+5
| * | Add more tests for merge request versions featureDmitriy Zaporozhets2016-09-071-3/+17
| * | Improve merge request version switch/compare dropdownDmitriy Zaporozhets2016-09-071-4/+21
| |/
* | Merge branch 'master' into revert-c676283bPhil Hughes2016-09-021-0/+31
|\ \ | |/
| * Fix diff comments on legacy MRsSean McGivern2016-08-301-0/+31
* | Merge branch 'master' into revert-c676283bPhil Hughes2016-08-3013-35/+954
|\ \ | |/
| * Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-...Robert Speicher2016-08-251-1/+2
| |\
| | * Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-dataSean McGivern2016-08-251-1/+2
| * | Merge branch 'dz-merge-request-version'Douwe Maan2016-08-251-0/+37
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-195-1/+667
| | |\
| | * \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-156-13/+19
| | |\ \
| | * | | Refactor MergeRequestDiff initialize methodDmitriy Zaporozhets2016-08-021-1/+0
| | * | | Add feature test for merge request versionDmitriy Zaporozhets2016-08-021-0/+38
| * | | | Added unfold test to parallel and added 'diff discussion' contextLuke Bennett2016-08-231-2/+33
| * | | | Better first match on this MR alsoLuke Bennett2016-08-231-1/+1
| * | | | Updated to optimized specs from !5864Luke Bennett2016-08-231-138/+0
| * | | | Added 'with an unfolded line should not allow commenting' scenario (line 125)Luke Bennett2016-08-231-0/+153
| * | | | Merge branch 'revert_revert_issuable_lock' into 'master' Douwe Maan2016-08-231-0/+11
| |\ \ \ \
| | * | | | Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-221-0/+11
| | | |_|/ | | |/| |
| * | | | Fixed timing issue with selecting parallel or inline view typestests-for-diff-notesLuke Bennett2016-08-221-5/+3
| * | | | Replaced all `first` with `match:` equivalentsLuke Bennett2016-08-211-0/+163
| |/ / /
| * | | Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-191-0/+497
| |\ \ \
| | * \ \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-181-1/+18
| | |\ \ \
| | * \ \ \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-172-0/+120
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-161-0/+2
| | |\ \ \ \ \
| | * | | | | | Add test for jumping between discussions and unhiding toggled discussions.Connor Shea2016-08-161-0/+18
| | * | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-125-13/+17
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-031-21/+12
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Updated issues with jump tp buttonPhil Hughes2016-08-011-2/+3
| | * | | | | | | Tests for not logged in userPhil Hughes2016-07-291-7/+30
| | * | | | | | | Added tests for hidden jump to buttonPhil Hughes2016-07-291-0/+14
View Lorry Controller Status