summaryrefslogtreecommitdiff
path: root/app/services/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-213-11/+11
* Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-151-3/+3
* Merge branch '32983-merge-conflict-resolution-removed-the-newline-in-the-end-...Rémy Coutable2017-06-021-5/+7
|\
| * Keep trailing newline when picking conflict sections32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-fileSean McGivern2017-06-011-5/+7
* | Fix race condition between pipeline creation and MR diff_head_sha updateDouwe Maan2017-06-011-6/+3
|/
* Merge branch 'issue_32225_2' into 'master'Kamil Trzciński2017-05-301-0/+18
|\
| * Set head pipeline when creating merge requestsissue_32225_2Felipe Artur2017-05-291-0/+18
* | Fix counters cache invalidation for Issues and Merge RequestsValery Sizov2017-05-263-0/+3
* | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-232-3/+3
|/
* Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missingDouwe Maan2017-05-181-0/+1
* Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-124-65/+99
* Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-043-3/+11
* Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-041-0/+54
* Fix 404 when upstream has disabled merge requestsmhasbini2017-04-271-1/+1
* Merge branch '30291-reopen-mr' into 'master'Sean McGivern2017-04-061-1/+1
|\
| * Search for opened MRs - include reopened MRs30291-reopen-mrJarka Kadlecova2017-04-061-1/+1
* | Merge branch '29364-private-projects-mr-fix'Sean McGivern2017-04-051-1/+3
|/
* Create todos only for new mentionsJarka Kadlecova2017-03-291-1/+1
* Allow creating merge request even if target branch is not specified in query ...Adam Niedzielski2017-03-171-1/+1
* Add ability to disable Merge Request URL on pushAlex Sanford2017-03-171-0/+2
* Use Enumerable#index_by where possibledm-use-index-byDouwe Maan2017-03-161-4/+1
* Merge branch 'fix/mwbs-to-mwps' into 'master' Douwe Maan2017-03-012-12/+12
|\
| * Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-012-12/+12
* | Enable and autocorrect the CustomErrorClass copSean McGivern2017-03-011-2/+1
|/
* 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
* Only create unmergeable todos onceonly-create-unmergeable-todo-onceSean McGivern2017-02-241-1/+5
* Create compare object with default branch when target branch is missingissue_28051_2Felipe Artur2017-02-211-11/+15
* Merge branch 'fix-merge-service-with-no-source' into 'master' Rémy Coutable2017-02-171-1/+1
|\
| * Fix merge service error with no sourcefix-merge-service-with-no-sourceSean McGivern2017-02-171-1/+1
* | Merge branch 'master' into fix/gb/pipeline-retry-builds-startedGrzegorz Bizon2017-02-172-9/+15
|\ \ | |/
| * Show merge errors in merge request widgetSean McGivern2017-02-161-8/+10
| * Mark as WIP based on MR commits onlyJarka Kadlecova2017-02-131-1/+5
* | Make it possible to resolve all todos for pipelineGrzegorz Bizon2017-02-151-0/+6
|/
* Backport changes from EE squashSean McGivern2017-02-031-4/+10
* Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-021-57/+72
|\
| * refactor merge request build serviceRydkin Maxim2017-01-311-57/+72
* | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-263-23/+49
|\ \ | |/
| * Backport EE changes on approvals reset for closed MRsbackport-ee-1051-approvals-reset-on-closed-mrOswaldo Ferreira2017-01-232-23/+15
| * Mark MR as WIP when pushing WIP commitsjurre2017-01-191-0/+19
| * support `/merge` slash comand for MRsJarka Kadlecova2017-01-111-0/+15
* | Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-043-6/+2
|\ \ | |/
| * Check if user can read issue before being assignedissue_22664Felipe Artur2016-12-271-4/+0
| * Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-162-2/+2
* | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-101-4/+6
|\ \ | |/
| * Do not reload diff for merge request made from fork when target branch in for...do-not-refresh-main-when-fork-target-branch-updatedAdam Niedzielski2016-12-091-4/+6
* | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-081-1/+1
|\ \ | |/
| * Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master' Kamil Trzciński2016-12-051-1/+1
| |\
| | * Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-302-3/+3
| | |\
| | * \ Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-253-17/+15
| | |\ \
| | * | | Rename MWBS service to Merge When Pipeline SucceedsGrzegorz Bizon2016-11-211-1/+1
View Lorry Controller Status