summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/merge_service.rb
Commit message (Expand)AuthorAgeFilesLines
* Add a rubocop for Rails.loggerMayra Cabrera2019-07-101-2/+2
* [CE port] Bypass push rules for merge to ref serviceosw-bypass-push-rules-for-merge-to-refOswaldo Ferreira2019-07-091-2/+2
* Allow custom hooks errors to appear in GitLab UILuke Duncalfe2019-03-261-2/+2
* Revert "Merge branch 'sh-show-pre-receive-error-merge' into 'master'"Luke Duncalfe2019-03-081-1/+2
* Show pre-receive error message in merge request widgetStan Hu2019-03-021-2/+1
* Extend error checking to be overwritten in EEOswaldo Ferreira2019-02-251-0/+2
* Check authorization in merge servicesOswaldo Ferreira2019-02-251-5/+16
* Support merge to ref for merge-commit and squashOswaldo Ferreira2019-02-251-37/+2
* Allow custom squash commit messagesLuke Duncalfe2019-02-061-10/+21
* Extract EE-specific lines from MRs controllerextract-ee-specific-lines-for-issues-and-mr-controllersSean McGivern2018-10-261-0/+5
* Enable more frozen string in app/services/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-apps-services-inner-moregfyoung2018-07-171-0/+2
* Don't use Gitlab::Utils.nlbr in Gitlab::GitJacob Vosmaer (GitLab)2018-06-111-1/+1
* Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-291-4/+13
* Save and expose only generic merge errorJan Provaznik2018-05-021-10/+19
* Merge branch 'osw-merge-process-logs' into 'master'Sean McGivern2017-11-201-0/+12
|\
| * Add MR reference to logsOswaldo Ferreira2017-11-201-5/+5
| * Add logs for monitoring the merge processosw-merge-process-logsOswaldo Ferreira2017-11-161-0/+12
* | Prevent fast forward merge when rebase is requiredissue_39773_beFelipe Artur2017-11-101-11/+16
|/
* Make merge_jid handling less stateful in MergeServiceOswaldo Ferreira2017-10-271-8/+1
* fix a whitespace34897-delete-branch-after-mergeMicael Bergeron2017-10-121-1/+1
* fix for discussionMicael Bergeron2017-10-121-3/+4
* fix the merger override to remove source branchmicael.bergeron2017-10-111-5/+8
* Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-281-7/+12
|\
| * Clean merge_jid whenever necessary on the merge process38476-improve-merge-jid-cleanup-on-merge-processOswaldo Ferreira2017-09-271-7/+12
* | Fast forward merge: basic implemenation[ci skip]Valery Sizov2017-09-191-0/+5
|/
* Prepare Repository#merge for migration to Gitalyoperation-service-mergeJacob Vosmaer2017-09-151-8/+2
* Cleans merge_jid when possible on MergeService36114-stuck-mrs-job-follow-upOswaldo Ferreira2017-08-281-3/+6
* Track enqueued and ongoing MRsOswaldo Ferreira2017-08-281-0/+3
* Move GitHooksService to Gitlab::GitJacob Vosmaer2017-08-231-1/+1
* Prevent accidental deletion of protected MR source branch by repeating checks...dm-always-verify-source-branch-can-be-deletedDouwe Maan2017-07-041-2/+6
* Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-2/+2
* 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
View Lorry Controller Status