summaryrefslogtreecommitdiff
path: root/app/services/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Store only generic message if rebase fails4020-rebase-messageJan Provaznik2018-01-091-3/+5
* Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-052-0/+54
* Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-044-3/+38
|\
| * Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-024-3/+38
* | Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez2017-12-271-1/+1
|/
* diff notes created in merge request on a commit have the right contextmicael.bergeron2017-12-071-1/+1
* Ensure pippeline corresponds with the sha of an MRJarka Kadlecova2017-12-051-0/+1
* Create merge request from emailJan Provaznik2017-12-052-2/+12
* Merge branch '21143-customize-branch-name-when-using-create-branch-in-an-issu...Sean McGivern2017-11-292-32/+58
|\
| * Add an ability to use a custom branch name on creation from issuesVitaliy @blackst0ne Klachkov2017-11-252-32/+58
* | Merge branch '40530-merge-request-generates-wrong-diff-when-branch-and-tag-ha...Rémy Coutable2017-11-281-3/+13
|\ \
| * | Ensure MRs always use branch refs for comparisonSean McGivern2017-11-281-3/+13
* | | Refactor the way we pass `old associations` to issuable's update services40226-refactor-the-issuable-s-webhooks-data-architectureRémy Coutable2017-11-242-6/+7
|/ /
* | Merge branch 'issue_40374' into 'master'Sean McGivern2017-11-241-14/+0
|\ \
| * | Fix WIP system note not being createdissue_40374Felipe Artur2017-11-231-14/+0
| |/
* | Use latest_merge_request_diff associationSean McGivern2017-11-231-1/+1
|/
* Merge branch 'osw-merge-process-logs' into 'master'Sean McGivern2017-11-201-0/+12
|\
| * Add MR reference to logsOswaldo Ferreira2017-11-201-5/+5
| * Add logs for monitoring the merge processosw-merge-process-logsOswaldo Ferreira2017-11-161-0/+12
* | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-201-0/+1
|\ \
| * | Adds Rubocop rule for line break after guard clauseJacopo2017-11-161-0/+1
* | | Add total_time_spent to the `changes` hash in issuable Webhook payloads40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-addedRémy Coutable2017-11-151-4/+4
|/ /
* | Prevent fast forward merge when rebase is requiredissue_39773_beFelipe Artur2017-11-101-11/+16
|/
* CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-021-4/+6
* Refresh open Issue and Merge Request project counter caches when re-openingRob Ede2017-10-301-0/+1
* Make merge_jid handling less stateful in MergeServiceOswaldo Ferreira2017-10-271-8/+1
* Merge branch '38236-remove-build-failed-todo-if-it-has-been-auto-retried' int...Grzegorz Bizon2017-10-161-1/+1
|\
| * Don't create build failed todo when build is retried38236-remove-build-failed-todo-if-it-has-been-auto-retriedSean McGivern2017-10-161-1/+1
* | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-1/+1
* | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-122-3/+3
* | Encapsulate git operations for conflict resolution into libAlejandro Rodríguez2017-10-121-46/+2
|/
* fix a whitespace34897-delete-branch-after-mergeMicael Bergeron2017-10-121-1/+1
* fix for discussionMicael Bergeron2017-10-121-3/+4
* fix the merger override to remove source branchmicael.bergeron2017-10-111-5/+8
* Start adding Gitlab::HookData::IssuableBuilderRémy Coutable2017-10-091-4/+4
* Include the changes in issuable webhook payloadsRémy Coutable2017-10-092-8/+8
* 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
|\ \ | |/ |/|
View Lorry Controller Status