summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* 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
* Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-6/+6
* Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-122-14/+21
* Encapsulate git operations for conflict resolution into libAlejandro Rodríguez2017-10-121-1/+1
* Merge branch '34897-delete-branch-after-merge' into 'master'Sean McGivern2017-10-121-7/+16
|\
| * add specmicael.bergeron2017-10-111-7/+16
* | Backport EE change for setting up forked projectbackport-ee-change-for-testLin Jen-Shin2017-10-111-5/+1
|/
* Fix text for the merge request lock system noteJarka Kadlecova2017-10-101-2/+2
* Start adding Gitlab::HookData::IssuableBuilderRémy Coutable2017-10-091-2/+3
* Include the changes in issuable webhook payloadsRémy Coutable2017-10-092-5/+5
* Add a project forks spec helperBob Van Landuyt2017-10-073-13/+19
* Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-061-1/+10
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issu...Jarka Kadlecova2017-10-032-3/+31
| |\
| * \ Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-202-2/+2
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-181-3/+1
| |\ \ \
| * | | | Create system notes for MR too, improve doc + clean up codeJarka Kadlecova2017-09-141-0/+7
| * | | | Support discussion locking in the backendJarka Kadlecova2017-09-141-1/+3
* | | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-282-3/+31
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Clear merge requests counter cache after mergeSean McGivern2017-09-281-0/+11
| * | | | Clean merge_jid whenever necessary on the merge process38476-improve-merge-jid-cleanup-on-merge-processOswaldo Ferreira2017-09-271-3/+20
| | |_|/ | |/| |
* | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-262-2/+2
|\ \ \ \ | |/ / /
| * | | Fix refreshing of issues/MR count cachesfix-counts-cachingYorick Peterse2017-09-192-2/+2
| | |/ | |/|
* | | Add spec for FfMergeServiceValery Sizov2017-09-191-0/+84
|/ /
* | Prepare Repository#merge for migration to Gitalyoperation-service-mergeJacob Vosmaer2017-09-151-3/+1
|/
* 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
* Merge branch 'git-operation-user' into 'master'Sean McGivern2017-08-241-1/+1
|\
| * Move GitHooksService to Gitlab::GitJacob Vosmaer2017-08-231-1/+1
* | Merge branch 'cache-issue-and-mr-counts' into 'master'Douwe Maan2017-08-233-14/+32
|\ \ | |/ |/|
| * Cache the number of open issues and merge requestsYorick Peterse2017-08-233-14/+32
* | Merge branch '35343-inherit-milestones-and-labels' into 'master'Sean McGivern2017-08-211-2/+18
|\ \ | |/ |/|
| * [skip ci] changelog and minor style changes addedhaseeb2017-08-181-2/+2
| * moved merge parms to servicehaseeb2017-08-171-21/+12
| * tests for inheriting milestones and labelshaseeb2017-08-111-1/+26
* | Don't create event in Merge Request Create ServiceJarka Kadlecova2017-08-161-0/+10
* | Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-111-1/+1
|\ \ | |/
| * Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-091-1/+1
* | Fix more testsLin Jen-Shin2017-08-111-4/+4
|/
* Don't include EmailHelpers manually, pick with rspecuse-rspec-support-helperLin Jen-Shin2017-08-031-3/+1
* Change all `:empty_project` to `:project`rs-empty_project-defaultRobert Speicher2017-08-021-2/+2
* Merge issuable "reopened" state into "opened"merge-issuable-reopened-into-opened-stateYorick Peterse2017-07-282-2/+2
* Use described_class when possibleRémy Coutable2017-07-274-16/+16
* Remove superfluous lib: true, type: redis, service: true, models: true, servi...Rémy Coutable2017-07-2711-11/+11
* Support both internal and external issue trackersJarka Kadlecova2017-07-241-1/+1
* Merge branch 'fix-mrs-merged-immediately' into 'master'Robert Speicher2017-07-071-10/+44
|\
| * Don't mark empty MRs as merged on push to the target branchfix-mrs-merged-immediatelySean McGivern2017-07-071-10/+44
* | Native group milestonesFelipe Artur2017-07-071-3/+3
|/
* 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-217-37/+36
View Lorry Controller Status