summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/merge_service_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc42GitLab Bot2021-04-201-14/+1
* Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40GitLab Bot2021-03-161-7/+6
* Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42GitLab Bot2021-02-181-8/+6
* Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42Robert Speicher2021-01-201-0/+30
* Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42GitLab Bot2020-10-211-18/+4
* Add latest changes from gitlab-org/gitlab@13-4-stable-eeGitLab Bot2020-09-191-4/+42
* Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot2020-07-201-1/+20
* Add latest changes from gitlab-org/gitlab@13-1-stable-eeGitLab Bot2020-06-181-12/+29
* Add latest changes from gitlab-org/gitlab@13-0-stable-eeGitLab Bot2020-05-201-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-04-071-17/+0
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-04-011-0/+17
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-03-131-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-03-121-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-211-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-101-0/+5
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-01-101-2/+2
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-031-5/+6
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-11-191-8/+0
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-11-151-19/+87
* [CE port] Bypass push rules for merge to ref serviceosw-bypass-push-rules-for-merge-to-refOswaldo Ferreira2019-07-091-0/+13
* Replace 'JIRA' with 'Jira'Takuya Noguchi2019-06-281-3/+3
* Add frozen_string_literal to spec/servicesfrozen_string_literal_spec_servicesThong Kuah2019-04-121-0/+2
* [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-081-2/+2
* Allow custom hooks errors to appear in GitLab UILuke Duncalfe2019-03-261-1/+1
* Revert "Merge branch 'sh-show-pre-receive-error-merge' into 'master'"Luke Duncalfe2019-03-081-1/+1
* Show pre-receive error message in merge request widgetStan Hu2019-03-021-1/+1
* Check authorization in merge servicesOswaldo Ferreira2019-02-251-0/+12
* Allow custom squash commit messagesLuke Duncalfe2019-02-061-1/+1
* Retrieve merge request closing issues from database cacheFelipe Artur2018-08-061-0/+1
* Resolve "Rename the `Master` role to `Maintainer`" BackendMark Chao2018-07-111-1/+1
* Updates from `rubocop -a`Lin Jen-Shin2018-07-091-1/+1
* 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-13/+47
* Save and expose only generic merge errorJan Provaznik2018-05-021-2/+2
* Clear caches before updating MR diffsZeger-Jan van de Weg2017-12-141-4/+4
* Prevent fast forward merge when rebase is requiredissue_39773_beFelipe Artur2017-11-101-0/+22
* Make merge_jid handling less stateful in MergeServiceOswaldo Ferreira2017-10-271-49/+0
* add specmicael.bergeron2017-10-111-7/+16
* Clean merge_jid whenever necessary on the merge process38476-improve-merge-jid-cleanup-on-merge-processOswaldo Ferreira2017-09-271-3/+20
* Cleans merge_jid when possible on MergeService36114-stuck-mrs-job-follow-upOswaldo Ferreira2017-08-281-5/+28
* Track enqueued and ongoing MRsOswaldo Ferreira2017-08-281-0/+9
* Move GitHooksService to Gitlab::GitJacob Vosmaer2017-08-231-1/+1
* Use described_class when possibleRémy Coutable2017-07-271-7/+7
* Remove superfluous lib: true, type: redis, service: true, models: true, servi...Rémy Coutable2017-07-271-1/+1
* Prevent accidental deletion of protected MR source branch by repeating checks...dm-always-verify-source-branch-can-be-deletedDouwe Maan2017-07-041-11/+58
* Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-3/+3
* Correct RSpec/SingleLineHook cop offensesRobert Speicher2017-06-141-1/+3
* Show merge errors in merge request widgetSean McGivern2017-02-161-9/+20
* Refactor JiraService by moving code out of JiraService#execute methodclean-up-jira-serviceAdam Niedzielski2016-12-011-1/+1
* Rephrase some system notes to be compatible with new system note stylerephrase-system-notesDouwe Maan2016-11-241-1/+1