summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge request title is in the notificationPhil Hughes2016-03-181-1/+2
* Commit SHA comes from JSONPhil Hughes2016-03-181-1/+2
* Fix code style issues.Jacob Schatz2016-03-181-3/+3
* Removes name from fileJacob Schatz2016-03-181-2/+2
* Adds notifications API to MR page.Jacob Schatz2016-03-181-15/+13
* Adds JSON callback, which is currently not working.Jacob Schatz2016-03-181-2/+9
* initial ajax buildJacob Schatz2016-03-181-1/+2
* Move the #toggle_subscription controller method to a concernRémy Coutable2016-03-151-9/+3
* Improving the original label-subscribing implementationRémy Coutable2016-03-151-0/+2
* Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-031-1/+3
* Rename Tasks to TodosDouglas Barbosa Alexandre2016-02-201-1/+1
* Create or mark task pending as soon the action happensDouglas Barbosa Alexandre2016-02-201-0/+2
* Label description and Label rowTap2016-02-171-0/+2
* Remember user's inline/tabular diff view preference in a cookiekkm2016-02-051-0/+2
* Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-201-2/+6
* Fix autocomplete for new issues/MRs/snippetsfix-autocomplete-new-issuesYorick Peterse2016-01-151-0/+1
* Get "Merge when build succeeds" to work when commits were pushed to MR target...Douwe Maan2016-01-051-1/+1
* Merge branch 'fix-merge-immediately' into 'master' Robert Speicher2015-12-161-1/+1
|\
| * Fix 'Merge Immediately' buttonfix-merge-immediatelyDouwe Maan2015-12-161-1/+1
* | Merge branch 'fix-endpoint-not-setting-var' into 'master' Douwe Maan2015-12-161-6/+3
|\ \ | |/ |/|
| * Fix endpoint not setting needed @ci_commitZeger-Jan van de Weg2015-12-161-6/+3
* | Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-141-3/+0
|\ \ | |/ |/|
| * Fix errorsKamil Trzcinski2015-12-111-3/+0
* | Implement new sidebar for merge request pageDmitriy Zaporozhets2015-12-111-2/+0
|/
* Give merge request widget the vars it desiresDouwe Maan2015-12-091-0/+5
* Merge branch 'master' into merge-if-greenDouwe Maan2015-12-091-12/+27
|\
| * Add Builds tab to MR detail pageDouwe Maan2015-12-081-12/+29
* | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-081-0/+2
|\ \
| * | Get ci_commit in MR controllerDouwe Maan2015-12-081-0/+2
| |/
* | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-071-4/+2
|\ \ | |/
| * Strip attributes for Milestone and Issuable. #3428Jose Corcuera2015-11-261-3/+1
| * award for merge requests[ci skip]Valery Sizov2015-11-191-1/+1
| * award emojiValery Sizov2015-11-191-1/+1
* | Refactor MergeWhenBuildSucceedsService and incorporate feedbackZeger-Jan van de Weg2015-11-231-8/+3
* | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-181-1/+4
|\ \ | |/
| * Fix trailing space issue with merge requests and issues. Fixes #2514Drew Blessing2015-11-101-1/+3
| * Display target branch on MR list when it is different from project's defaultAnton Baklanov2015-11-101-0/+1
* | API support, incorporated feedbackZeger-Jan van de Weg2015-11-181-3/+1
* | MRs author can cancel automatic mergeZeger-Jan van de Weg2015-11-021-1/+3
* | Merge when build succeedsZeger-Jan van de Weg2015-11-021-6/+29
|/
* Correctly find last known blob for file deleted in MR.merge-request-deleted-fileDouwe Maan2015-10-201-1/+4
* Show merge requests which close current issueZeger-Jan van de Weg2015-10-161-1/+1
* Simplify code around (cross)-referencesDouwe Maan2015-10-121-1/+1
* Improve error message when merging failsmr_improve_errors_handlingValery Sizov2015-10-011-0/+1
* Fix error when MR source branch no longer exists.fix-mr-missing-source-branch-errorDouwe Maan2015-09-221-2/+1
* Fetch merge request ref if it is missing when visit MR pagefix-mr-without-refsDmitriy Zaporozhets2015-09-211-0/+7
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-7/+5
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-5/+7
* Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-161-5/+5
* Refactor compare and fetch logicDmitriy Zaporozhets2015-07-151-2/+1
View Lorry Controller Status