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
2019-03-26Allow custom hooks errors to appear in GitLab UILuke Duncalfe
2019-03-08Revert "Merge branch 'sh-show-pre-receive-error-merge' into 'master'"Luke Duncalfe
2019-03-02Show pre-receive error message in merge request widgetStan Hu
2019-02-25Extend error checking to be overwritten in EEOswaldo Ferreira
2019-02-25Check authorization in merge servicesOswaldo Ferreira
2019-02-25Support merge to ref for merge-commit and squashOswaldo Ferreira
2019-02-06Allow custom squash commit messagesLuke Duncalfe
2018-10-26Extract EE-specific lines from MRs controllerSean McGivern
2018-07-18Enable more frozen string in app/services/**/*.rbgfyoung
2018-06-11Don't use Gitlab::Utils.nlbr in Gitlab::GitJacob Vosmaer (GitLab)
2018-05-29Add 'squash and rebase' feature to CEblackst0ne
2018-05-02Save and expose only generic merge errorJan Provaznik
2017-11-20Merge branch 'osw-merge-process-logs' into 'master'Sean McGivern
2017-11-20Add MR reference to logsOswaldo Ferreira
2017-11-16Add logs for monitoring the merge processOswaldo Ferreira
2017-11-10Prevent fast forward merge when rebase is requiredFelipe Artur
2017-10-27Make merge_jid handling less stateful in MergeServiceOswaldo Ferreira
2017-10-12fix a whitespaceMicael Bergeron
2017-10-12fix for discussionMicael Bergeron
2017-10-11fix the merger override to remove source branchmicael.bergeron
2017-09-29Merge branch 'master' into ff_port_from_eeEric Eastwood
2017-09-27Clean merge_jid whenever necessary on the merge processOswaldo Ferreira
2017-09-20Fast forward merge: basic implemenation[ci skip]Valery Sizov
2017-09-15Prepare Repository#merge for migration to GitalyJacob Vosmaer
2017-08-28Cleans merge_jid when possible on MergeServiceOswaldo Ferreira
2017-08-28Track enqueued and ongoing MRsOswaldo Ferreira
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-02 00:31:03 +0300