summaryrefslogtreecommitdiff
path: root/app/services/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-282-7/+13
|\
| * Clear merge requests counter cache after mergeSean McGivern2017-09-281-0/+1
| * Clean merge_jid whenever necessary on the merge process38476-improve-merge-jid-cleanup-on-merge-processOswaldo Ferreira2017-09-271-7/+12
* | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-261-0/+1
|\ \ | |/
| * Fix refreshing of issues/MR count cachesfix-counts-cachingYorick Peterse2017-09-191-0/+1
* | Fast forward merge: basic implemenation[ci skip]Valery Sizov2017-09-192-0/+29
|/
* Detect n+1 issues involving GitalyAndrew Newdigate2017-09-191-1/+4
* Prepare Repository#merge for migration to Gitalyoperation-service-mergeJacob Vosmaer2017-09-151-8/+2
* Cleans merge_jid when possible on MergeService36114-stuck-mrs-job-follow-upOswaldo Ferreira2017-08-281-3/+6
* Rename MergeRequest#async_merge to merge_asyncOswaldo Ferreira2017-08-282-2/+2
* Track enqueued and ongoing MRsOswaldo Ferreira2017-08-283-2/+5
* 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-231-0/+2
|\ \ | |/ |/|
| * Cache the number of open issues and merge requestsYorick Peterse2017-08-231-0/+2
* | Make RuboCop happySean McGivern2017-08-211-1/+1
* | Merge branch '35343-inherit-milestones-and-labels' into 'master'Sean McGivern2017-08-211-1/+4
|\ \ | |/ |/|
| * [skip ci] changelog and minor style changes addedhaseeb2017-08-181-1/+1
| * moved merge parms to servicehaseeb2017-08-171-1/+4
| * working version of create merge requests with labelshaseeb2017-08-101-3/+1
| * copy milestones from issue when using create merge request btnhaseeb2017-08-101-1/+3
* | Don't create event in Merge Request Create ServiceJarka Kadlecova2017-08-161-1/+0
|/
* Simplify checking if objects exist code in new issaubles workers36119-issuable-workersJarka Kadlecova2017-08-081-0/+1
* Merge branch '32844-issuables-performance' into 'master'Sean McGivern2017-08-071-1/+7
|\
| * Move some after_create parts to worker to improve performance32844-issuables-performanceJarka Kadlecova2017-08-071-1/+7
* | essentialShinya Maeda2017-08-041-1/+6
|/
* Merge issuable "reopened" state into "opened"merge-issuable-reopened-into-opened-stateYorick Peterse2017-07-282-4/+4
* Clear issuable counter caches on updateclear-issuable-count-cache-for-statesSean McGivern2017-07-193-3/+3
* Backport MR create service changes from EEbackport-mr-create-service-changesSean McGivern2017-07-121-2/+1
* Don't mark empty MRs as merged on push to the target branchfix-mrs-merged-immediatelySean McGivern2017-07-071-2/+3
* Add table for merge request commitsSean McGivern2017-07-061-3/+3
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-2/+2
* Prevent accidental deletion of protected MR source branch by repeating checks...dm-always-verify-source-branch-can-be-deletedDouwe Maan2017-07-041-2/+6
* Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-281-1/+1
* 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
View Lorry Controller Status