summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/merge_requests_controller_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* 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
* Add spec for assigning view param from cookiekkm/gitlab-ce-user-diff-view-pref-cookieRobert Speicher2016-02-051-5/+19
* Add a controller test for the new 'diff_view' cookieRémy Coutable2016-02-051-1/+13
* Fix 500 error when creating a merge request that removes a submoduleDouglas Barbosa Alexandre2015-12-041-0/+24
* Add ignore white space option in merge request diffMinsik Yoon2015-11-131-0/+28
* Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets2015-06-231-4/+4
|\
| * Change `to_not` calls to `not_to`Robert Speicher2015-06-221-4/+4
* | Fix Style/AlignHash cop violationsStan Hu2015-06-221-18/+44
|/
* Load the Merge Request > Commits tab lazilyRobert Speicher2015-06-171-15/+64
* Move Projects::MergeRequestsController spec to its correct locationRobert Speicher2015-06-171-0/+101
View Lorry Controller Status