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
2022-06-20Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42GitLab Bot
2021-05-19Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42GitLab Bot
2021-03-16Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40GitLab Bot
2021-02-18Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42GitLab Bot
2021-01-20Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42Robert Speicher
2020-10-21Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42GitLab Bot
2020-09-19Add latest changes from gitlab-org/gitlab@13-4-stable-eeGitLab Bot
2020-07-20Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot
2020-06-18Add latest changes from gitlab-org/gitlab@13-1-stable-eeGitLab Bot
2020-04-07Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-04-01Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-02-10Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-12-03Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-11-19Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-11-15Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-07-10Add a rubocop for Rails.loggerMayra Cabrera
2019-07-09[CE port] Bypass push rules for merge to ref serviceOswaldo Ferreira
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-16 14:13:23 +0300