summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* 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
* Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-151-2/+2
* Correct RSpec/SingleLineHook cop offensesRobert Speicher2017-06-144-6/+18
* Only add a description change note when no tasks are updatedJared Deckard2017-06-121-0/+13
* Move diffable? method from Repository to Diff::Filedm-diff-file-diffableDouwe Maan2017-06-081-2/+2
* Keep trailing newline when picking conflict sections32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-fileSean McGivern2017-06-011-3/+39
* Merge branch 'issue_32225_2' into 'master'Kamil Trzciński2017-05-301-0/+31
|\
| * Set head pipeline when creating merge requestsissue_32225_2Felipe Artur2017-05-291-0/+31
* | Fix counters cache invalidation for Issues and Merge RequestsValery Sizov2017-05-263-0/+19
|/
* Add transient head_pipeline_of to pipeline factoriesissue_32225Felipe Artur2017-05-222-13/+10
* Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missingDouwe Maan2017-05-181-0/+7
* [Spec optimization] Joining one-line 'it' blocksspec-joining-itValery Sizov2017-05-152-19/+29
* Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-122-16/+98
|\
| * Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-122-16/+98
* | Move update_assignee_cache_counts to the serviceValery Sizov2017-05-122-0/+29
|/
* Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-101-1/+1
* Fix specs 2Felipe Artur2017-05-082-2/+2
* Fix SpecsFelipe Artur2017-05-082-1/+9
* Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable'Sean McGivern2017-05-051-0/+7
|\
| * Updated specsblackst0ne2017-05-051-0/+7
* | Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-043-6/+134
* | Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-041-0/+74
|/
* Merge branch 'rs-described_class-cop-2' into 'master' Douwe Maan2017-05-023-9/+9
|\
| * Auto-correct `RSpec/DescribedClass` violationsrs-described_class-cop-2Robert Speicher2017-05-013-9/+9
* | Merge branch '26488-target-disabled-mr' into 'master' Sean McGivern2017-05-021-0/+10
|\ \ | |/ |/|
| * Fix 404 when upstream has disabled merge requestsmhasbini2017-04-271-0/+10