summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Enable RSpec/FilePath copenable-spec-file-name-copSean McGivern2017-04-261-0/+0
|/
* Merge branch '30291-reopen-mr' into 'master'Sean McGivern2017-04-061-0/+27
|\
| * Search for opened MRs - include reopened MRs30291-reopen-mrJarka Kadlecova2017-04-061-0/+27
* | Merge branch '29364-private-projects-mr-fix'Sean McGivern2017-04-051-1/+41
|/
* Create todos only for new mentionsJarka Kadlecova2017-03-291-1/+10
* Use `:empty_project` where possible in service specsRobert Speicher2017-03-279-11/+11
* Allow creating merge request even if target branch is not specified in query ...Adam Niedzielski2017-03-171-1/+4
* Add ability to disable Merge Request URL on pushAlex Sanford2017-03-171-0/+10
* Speed up MergeRequest::RefreshService spec by combining examplessh-speed-up-refresh-serviceStan Hu2017-03-081-47/+57
* Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-012-9/+9
* Merge branch 'only-create-unmergeable-todo-once' into 'master' Kamil Trzciński2017-02-281-0/+25
|\
| * Only create unmergeable todos onceonly-create-unmergeable-todo-onceSean McGivern2017-02-241-0/+25
* | Rename commit_file, commit_dir and remove_file and update specsDouwe Maan2017-02-241-3/+2
|/
* Revert "Enable Style/DotPosition"Douwe Maan2017-02-233-21/+21
* Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-238-47/+47
* Fix new offensesDouwe Maan2017-02-231-3/+3
* Enable Style/WordArrayDouwe Maan2017-02-231-4/+4
* Prefer leading style for Style/DotPositionDouwe Maan2017-02-238-47/+47
* Enable Style/DotPositionDouwe Maan2017-02-232-18/+18
* Create compare object with default branch when target branch is missingissue_28051_2Felipe Artur2017-02-211-7/+6