Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/merge_service.rb
AgeCommit message (Expand)Author
2017-08-23Move GitHooksService to Gitlab::GitJacob Vosmaer
2017-07-04Prevent accidental deletion of protected MR source branch by repeating checks...Douwe Maan
2017-06-21Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon
2017-02-28Use exceptions for MergeService error handlingSean McGivern
2017-02-17Fix merge service error with no sourceSean McGivern
2017-02-16Show merge errors in merge request widgetSean McGivern
2017-02-03Backport changes from EE squashSean McGivern
2016-10-19Identify merge request project and IID in log messageStan Hu
2016-10-19Improve error logging of MergeServiceStan Hu
2016-07-29Properly abort a merge when merge conflicts occurStan Hu
2016-07-18Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable
2016-07-13Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher
2016-07-13Enforce "developers can merge" during `pre-receive`.Timothy Andrew
2016-07-07Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan
2016-07-04Handle custom Git hook result in GitLab UIValery Sizov
2016-05-20Allows MR authors to have the source branch removed when merging the MRJeroen Jacobs
2016-02-19Save merge commit id when MR is mergedRubén Dávila
2016-01-14Param should be present, not just truthyDouwe Maan
2015-12-07Merge branch 'master' into merge-if-greenZeger-Jan van de Weg
2015-11-25Rescue StandardError, not ExceptionRobert Speicher
2015-11-18API support, incorporated feedbackZeger-Jan van de Weg
2015-10-07Add directory feature buttonStan Hu
2015-10-01Improve error message when merging failsValery Sizov
2015-08-14merge with support of pre-receive and post-receive hooksDmitriy Zaporozhets
2015-08-11Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets
2015-08-11Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets
2015-07-16Huge refactoring for accepting merge requestsDmitriy Zaporozhets
2015-01-26Organize event order execution when update issue or mrDmitriy Zaporozhets
2015-01-20Add action property to merge request hookjubianchi
2015-01-07Ooops! Removing debug line :)Dmitriy Zaporozhets
2015-01-07Refactor merge request merge serviceDmitriy Zaporozhets
2014-03-25Remove author_id_of_changes from appDmitriy Zaporozhets
2014-03-25Use current_user for Notification#merge_mrDmitriy Zaporozhets
2014-01-24MergeRequests servicesDmitriy Zaporozhets
    generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 22:46:20 +0300