summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/migrate-rebase-to-gitaly' into 'master'Robert Speicher2018-01-111-37/+57
|\
| * Migrate Gitlab::Git::Repository#rebase to Gitalyfeature/migrate-rebase-to-gitalyAhmad Sherif2018-01-101-37/+57
* | Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' i...Grzegorz Bizon2018-01-111-2/+24
|\ \
| * | Never set special MR titles for external issuesSean McGivern2018-01-101-0/+22
| * | Fix incorrect default merge request title when external issue tracker is acti...Benedikt Huss2018-01-091-2/+2
| |/
* | Store only generic message if rebase fails4020-rebase-messageJan Provaznik2018-01-091-7/+7
|/
* Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-051-0/+134
* Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-043-0/+39
|\
| * Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-023-0/+39
* | Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez2017-12-272-17/+29
|/
* Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specsblackst0ne2017-12-229-27/+27
* Merge branch 'gitaly-conflicts-prep' into 'master'Sean McGivern2017-12-151-1/+1
|\
| * Simplify conflict resolver interfacegitaly-conflicts-prepAlejandro Rodríguez2017-12-141-1/+1
* | Merge branch 'zj-mr-diff-memoization-bug' into 'master'Sean McGivern2017-12-141-4/+4
|\ \
| * | Clear caches before updating MR diffsZeger-Jan van de Weg2017-12-141-4/+4
| |/
* | Execute quick actions when creating MR from issuefix-create-mr-from-issue-with-templateSean McGivern2017-12-131-0/+12
|/
* Ensure pippeline corresponds with the sha of an MRJarka Kadlecova2017-12-051-0/+14
* Create merge request from emailJan Provaznik2017-12-051-0/+1
* Merge branch '21143-customize-branch-name-when-using-create-branch-in-an-issu...Sean McGivern2017-11-291-5/+19
|\
| * Add an ability to use a custom branch name on creation from issuesVitaliy @blackst0ne Klachkov2017-11-251-5/+19
* | Merge branch '40530-merge-request-generates-wrong-diff-when-branch-and-tag-ha...Rémy Coutable2017-11-281-1/+31
|\ \
| * | Ensure MRs always use branch refs for comparisonSean McGivern2017-11-281-1/+31
| |/
* | Refactor the way we pass `old associations` to issuable's update services40226-refactor-the-issuable-s-webhooks-data-architectureRémy Coutable2017-11-241-4/+12
|/
* 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-1/+1
* Prevent fast forward merge when rebase is requiredissue_39773_beFelipe Artur2017-11-101-0/+22
* Make merge_jid handling less stateful in MergeServiceOswaldo Ferreira2017-10-271-49/+0
* Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-6/+6
* Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-122-14/+21
* Encapsulate git operations for conflict resolution into libAlejandro Rodríguez2017-10-121-1/+1
* Merge branch '34897-delete-branch-after-merge' into 'master'Sean McGivern2017-10-121-7/+16
|\
| * add specmicael.bergeron2017-10-111-7/+16
* | Backport EE change for setting up forked projectbackport-ee-change-for-testLin Jen-Shin2017-10-111-5/+1
|/
* Fix text for the merge request lock system noteJarka Kadlecova2017-10-101-2/+2
* Start adding Gitlab::HookData::IssuableBuilderRémy Coutable2017-10-091-2/+3
* Include the changes in issuable webhook payloadsRémy Coutable2017-10-092-5/+5
* Add a project forks spec helperBob Van Landuyt2017-10-073-13/+19
* Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-061-1/+10
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issu...Jarka Kadlecova2017-10-032-3/+31
| |\
| * \ Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-202-2/+2
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-181-3/+1
| |\ \ \
| * | | | Create system notes for MR too, improve doc + clean up codeJarka Kadlecova2017-09-141-0/+7
| * | | | Support discussion locking in the backendJarka Kadlecova2017-09-141-1/+3
* | | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-282-3/+31
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Clear merge requests counter cache after mergeSean McGivern2017-09-281-0/+11
| * | | | Clean merge_jid whenever necessary on the merge process38476-improve-merge-jid-cleanup-on-merge-processOswaldo Ferreira2017-09-271-3/+20
| | |_|/ | |/| |
* | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-262-2/+2
|\ \ \ \ | |/ / /
| * | | Fix refreshing of issues/MR count cachesfix-counts-cachingYorick Peterse2017-09-192-2/+2
| | |/ | |/|
* | | Add spec for FfMergeServiceValery Sizov2017-09-191-0/+84
|/ /
* | Prepare Repository#merge for migration to Gitalyoperation-service-mergeJacob Vosmaer2017-09-151-3/+1
|/
* Cleans merge_jid when possible on MergeService36114-stuck-mrs-job-follow-upOswaldo Ferreira2017-08-281-5/+28
View Lorry Controller Status