summaryrefslogtreecommitdiff
path: root/app/services/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | Introduce Repository#with_tmp_ref which we needLin Jen-Shin2016-12-081-2/+3
|/ / / /
* | | | Replace references to MergeRequestDiff#commits with st_commitsuse-st-commits-where-possibleAdam Niedzielski2016-12-011-2/+2
| |_|/ |/| |
* | | Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-291-2/+2
* | | Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security' Douwe Maan2016-11-281-1/+1
| |/ |/|
* | Merge branch 'remove-require-from-services' into 'master' Robert Speicher2016-11-221-4/+0
|\ \
| * | Remove unnecessary require_relative calls from service classesSemyon Pupkov2016-11-221-4/+0
* | | Merge branch 'hide-empty-merge-request-diffs' into 'master' Sean McGivern2016-11-211-12/+9
|\ \ \
| * | | Revert "Do not create a MergeRequestDiff record when source branch is deleted"Adam Niedzielski2016-11-211-12/+9
| | |/ | |/|
* | | Do not create TODO when build is allowed to failGrzegorz Bizon2016-11-211-1/+6
|/ /
* | Fix regression in Merge request formAlex Sanford2016-11-191-2/+2
|/
* Do not create a MergeRequestDiff record when source branch is deletedfix-merge-request-screen-deleted-source-branchAdam Niedzielski2016-11-161-9/+12
* Add validation errors to Merge Request formAlex Sanford2016-11-011-16/+34
* Ignore external issues when bulk assigning issues to author of merge request.fix-bulk-assign-issues-for-external-issuesAdam Niedzielski2016-10-201-1/+1
* Identify merge request project and IID in log messagesh-improve-merge-service-loggingStan Hu2016-10-181-1/+7
* Improve error logging of MergeServiceStan Hu2016-10-181-4/+10
* Allow setting content for resolutionsSean McGivern2016-10-131-4/+20
* Merge branch '23234-deleting-a-milestone-removes-source-branch-deletion-optio...Rémy Coutable2016-10-131-1/+4
|\
| * Maintain "force_remove_source_branch" options on Merge Request unless specifiedMark Fletcher2016-10-131-1/+4
* | Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesGrzegorz Bizon2016-10-122-12/+46
|\ \ | |/
| * Merge branch 'assign-issues-for-merge-request-18876' into 'master' Douwe Maan2016-10-111-0/+35
| |\
| | * fixup! Added link to bulk assign issues to MR author. (Issue #18876)James Edwards-Jones2016-10-071-3/+3
View Lorry Controller Status