summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/merge_service.rb
Commit message (Expand)AuthorAgeFilesLines
* Use exceptions for MergeService error handling28769-raise-custom-exception-in-all-methods-of-mergeservice-that-want-to-inform-the-userSean McGivern2017-02-281-11/+9
* Fix merge service error with no sourcefix-merge-service-with-no-sourceSean McGivern2017-02-171-1/+1
* Show merge errors in merge request widgetSean McGivern2017-02-161-8/+10
* Backport changes from EE squashSean McGivern2017-02-031-4/+10
* Identify merge request project and IID in log messagesh-improve-merge-service-loggingStan Hu2016-10-181-1/+7
* Improve error logging of MergeServiceStan Hu2016-10-181-4/+10
* Properly abort a merge when merge conflicts occurreject-merge-conflictsStan Hu2016-07-291-1/+7
* Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-181-1/+3
* Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-131-3/+1
* Enforce "developers can merge" during `pre-receive`.Timothy Andrew2016-07-131-1/+3
* Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-061-1/+1
* Handle custom Git hook result in GitLab UIValery Sizov2016-07-041-1/+4
* Allows MR authors to have the source branch removed when merging the MRJeroen Jacobs2016-05-201-2/+6
* Save merge commit id when MR is mergedRubén Dávila2016-02-191-1/+2
* Param should be present, not just truthybackport-eeDouwe Maan2016-01-141-1/+1
* Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-071-1/+1
|\
| * Rescue StandardError, not Exceptionrs-rescue-standarderrorRobert Speicher2015-11-241-1/+1
* | API support, incorporated feedbackZeger-Jan van de Weg2015-11-181-7/+9
|/
* Add directory feature buttonStan Hu2015-10-071-1/+1
* Improve error message when merging failsmr_improve_errors_handlingValery Sizov2015-10-011-0/+4
* merge with support of pre-receive and post-receive hooksDmitriy Zaporozhets2015-08-141-12/+2
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-13/+48
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-48/+13
* Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-161-13/+48
* Organize event order execution when update issue or mrDmitriy Zaporozhets2015-01-251-1/+1
* Add action property to merge request hookjubianchi2015-01-201-1/+1
* Ooops! Removing debug line :)Dmitriy Zaporozhets2015-01-061-1/+0
* Refactor merge request merge serviceDmitriy Zaporozhets2015-01-061-3/+5
* Remove author_id_of_changes from appDmitriy Zaporozhets2014-03-251-2/+1
* Use current_user for Notification#merge_mrDmitriy Zaporozhets2014-03-251-1/+1
* MergeRequests servicesDmitriy Zaporozhets2014-01-241-0/+22
View Lorry Controller Status