summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* 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
* Implement merge from forks without satellitesDmitriy Zaporozhets2015-07-151-1/+2
* Remove satellitesDmitriy Zaporozhets2015-07-151-2/+0
* Update controller filtersDmitriy Zaporozhets2015-06-261-3/+3
* Rename abilities to correspond contoller/model action namesrename-abilitiesDmitriy Zaporozhets2015-06-261-1/+1
* Improve performance for merge_request#show pageDmitriy Zaporozhets2015-06-241-0/+2
* Load the Merge Request > Commits tab lazilyRobert Speicher2015-06-171-1/+4
* Improve variables in mr widgetDmitriy Zaporozhets2015-06-111-12/+1
* Fix rubocopDmitriy Zaporozhets2015-06-111-2/+1
* Extract merge request widget JS to separate classDmitriy Zaporozhets2015-06-111-4/+0
* Refactor merge request widget step 2Dmitriy Zaporozhets2015-06-111-1/+9
* Add MergeRequests#commits action and routeRobert Speicher2015-05-291-5/+12
* Add search issues/MR by numberNikita Verkhovin2015-05-181-1/+9
* Don't allow a merge request to be merged when its title starts with "WIP".Douwe Maan2015-04-301-2/+2
* Use project.commit convenience method.Douwe Maan2015-04-241-1/+1
* Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-201-9/+9
* Refactor GitAccess to use instance variables.Douwe Maan2015-03-241-1/+1
* Link to CI with refValery Sizov2015-03-201-2/+2
View Lorry Controller Status