summaryrefslogtreecommitdiff
path: root/app/services/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Rename `create_merge_request` permissionsBob Van Landuyt2018-04-111-2/+2
* Prevent new merge requests for archived projectsBob Van Landuyt2018-04-111-1/+1
* Send notification emails when push to a merge requestYarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-to-the-merge-requestYarNayar2018-03-261-3/+5
* Only cache highlight results for latest MR diffsSean McGivern2018-03-151-1/+10
* Merge branch 'cache-refactor' into 'master'Sean McGivern2018-03-091-9/+1
|\
| * Cache `#can_be_resolved_in_ui?` git operationscache-refactorAlejandro Rodríguez2018-03-081-9/+1
* | Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-072-0/+9
|/
* Rename quick actions handlerOswaldo Ferreira2018-03-051-1/+1
* Move wip handling to MergeRequest::BaseServicewip-slash-command-on-mr-descriptionOswaldo Ferreira2018-03-012-0/+17
* /wip slash command on MR creationAdam Pahlevi2018-03-011-11/+0
* Fix closing issues text added to MRs for external issue trackersSean McGivern2018-02-141-2/+2
* Fix Error 500s creating merge requests with external issue trackersh-fix-issue-43193Stan Hu2018-02-121-3/+5
* Remove allow_n_plus_1_calls from MergeRequests::CreateServicefix/reduce-number-of-ref-exists-callsAhmad Sherif2018-02-071-4/+1
* Merge branch '40793-fix-mr-title-for-jira' into 'master'Sean McGivern2018-02-021-7/+23
|\
| * Resolve "Incorrect merge request title when Jira activated and multiple commi...Andrew McCallum2018-02-021-7/+23
* | Reload MRs memoization after diffs creationosw-system-notes-for-commits-regressionOswaldo Ferreira2018-02-011-1/+6
|/
* Close and do not reload MR diffs when source branch is deletedOswaldo Ferreira2018-01-291-2/+14
* Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'Oswaldo Ferreira2018-01-171-6/+22
|\
| * Merge branch '41567-projectfix' into 'security-10-3'Sean McGivern2018-01-161-6/+22
* | Merge branch '41727-target-branch-name' into 'master'Sean McGivern2018-01-171-0/+1
|\ \ | |/ |/|
| * Set target_branch to the ref branch when creating MR from issue41727-target-branch-nameJarka Kadlecová2018-01-171-0/+1
* | Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' i...Grzegorz Bizon2018-01-111-6/+2
|\ \
| * | Never set special MR titles for external issuesSean McGivern2018-01-101-6/+2
| * | Fix incorrect default merge request title when external issue tracker is acti...Benedikt Huss2018-01-091-1/+1
| |/
* | 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
View Lorry Controller Status