summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/merge_requests_controller_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Use deployment IID when saving refsZ.J. van de Weg2016-10-201-1/+1
* Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-171-0/+30
|\
| * Add test, fix merge errorzj-show-deployed-time-agoZ.J. van de Weg2016-10-141-0/+30
* | Add blob_ace_mode to conflict content responseSean McGivern2016-10-131-0/+1
* | Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-131-0/+1
* | Add JSON SchemaSean McGivern2016-10-131-0/+4
* | Make RuboCop happySean McGivern2016-10-131-1/+0
* | Allow setting content for resolutionsSean McGivern2016-10-131-9/+159
|/
* fixup! Added link to bulk assign issues to MR author. (Issue #18876)James Edwards-Jones2016-10-101-1/+1
* fixup! Added link to bulk assign issues to MR author. (Issue #18876)James Edwards-Jones2016-10-071-0/+17
* Added link to bulk assign issues to MR author. (Issue #18876)James2016-10-061-0/+31
* Add a /wip slash commandThomas Balthazar2016-10-031-0/+14
* Refresh todos count cache when an Issue/MR is deletedDouglas Barbosa Alexandre2016-09-081-0/+6
* Improve grammarKatarzyna Kobierska2016-08-301-2/+2
* User can edit closed MR with deleted forkKatarzyna Kobierska2016-08-301-0/+29
* Add more tests for conflictsSean McGivern2016-08-121-4/+4
* Remove undo endpointSean McGivern2016-08-121-13/+0
* Use same resolution format on FE and BESean McGivern2016-08-121-11/+12
* REMOVE THIS COMMIT: allow undoing last resolutionSean McGivern2016-08-121-0/+13
* Handle conflict resolution errors in controllerSean McGivern2016-08-121-2/+45
* Allow resolving conflicts in MR controllerSean McGivern2016-08-121-6/+33
* Handle multiple merge conflict files in collectionSean McGivern2016-08-121-0/+65
* fixes part1 of files to start using active tensetiagonbotelho2016-08-091-6/+6
* Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-031-9/+9
* Cache highlighted diff lines for merge requestsPaco Guzman2016-08-031-9/+9
* Support renames in diff_for_path actionsSean McGivern2016-07-111-12/+12
* Tidy up spec action namesSean McGivern2016-07-081-8/+8
* Collapse large diffs by defaultSean McGivern2016-07-081-61/+175
* Add send_git_patch helperDouwe Maan2016-07-061-1/+1
* Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-061-3/+3
* Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-011-2/+0
* Merge branch 'zj-workhorse-format-patch' into 'master' Robert Speicher2016-06-291-15/+3
|\
| * Workhorse to serve email diffsZ.J. van de Weg2016-06-281-15/+3
* | Use HTTP matchers if possibleZ.J. van de Weg2016-06-271-2/+2
|/
* Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_mer...19035-fix-merge-issueRémy Coutable2016-06-241-0/+12
* Add send_git_diff helperDouwe Maan2016-06-081-7/+4
|\
| * Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-formatJacob Vosmaer (GitLab)2016-06-071-6/+3
| |\
| | * Workhorse to serve raw diffsZeger-Jan van de Weg2016-06-031-6/+3
| |/ |/|
| * Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-031-1/+1
|/
* Don't allow merges with new commitsSean McGivern2016-06-011-0/+86
* Enable Style/RedundantParentheses rubocop coprubocop/enable-redundant-parentheses-copGrzegorz Bizon2016-05-301-1/+1
* Clarify that the diff view setting always comes from the cookiers-diff_viewRobert Speicher2016-04-191-8/+0
* Add changelog entry, improve specs and model codeissue_15044Felipe Artur2016-04-121-5/+4
* Allow to close invalid merge requestFelipe Artur2016-04-111-0/+29
* Fixed MergeRequestController specpatch/fix-mergerequest-diffGabriel Mazetto2016-03-301-1/+1
* Minor improvements on IssuableActionsZeger-Jan van de Weg2016-03-211-11/+13
* minor improvements and fixed specsZeger-Jan van de Weg2016-03-191-1/+1
* Dry destroy action on issuablesZeger-Jan van de Weg2016-03-191-4/+4
* Soft delete issuablesZeger-Jan van de Weg2016-03-191-0/+21
* Reopened MRs should also be considered as open.issue_13539Rubén Dávila2016-02-171-0/+34
View Lorry Controller Status