summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/merge_service.rb
Commit message (Expand)AuthorAgeFilesLines
...
* 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