summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gitaly-lfs-client-prep' into 'master'Robert Speicher2018-02-061-1/+1
|\
| * Refactor Gitlab::Git code related to LFS changes for Gitaly migrationgitaly-lfs-client-prepAlejandro Rodríguez2018-02-021-1/+1
* | Merge branch '40793-fix-mr-title-for-jira' into 'master'Sean McGivern2018-02-021-5/+53
|\ \
| * | Resolve "Incorrect merge request title when Jira activated and multiple commi...Andrew McCallum2018-02-021-5/+53
* | | Merge branch 'osw-system-notes-for-commits-regression' into 'master'Sean McGivern2018-02-021-31/+23
|\ \ \ | |/ / |/| |
| * | Fix and improve stubbed test for WIP commit refOswaldo Ferreira2018-02-021-31/+15
| * | Reload MRs memoization after diffs creationosw-system-notes-for-commits-regressionOswaldo Ferreira2018-02-011-0/+8
* | | Merge branch '36009-user-default-project-creator-in-factories' into 'master'Robert Speicher2018-02-014-4/+6
|\ \ \ | |/ / |/| |
| * | Make user/author use project.creator in most factoriesRémy Coutable2018-01-314-4/+6
| |/
* | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-011-1/+1
|/
* Close and do not reload MR diffs when source branch is deletedOswaldo Ferreira2018-01-291-2/+23
* Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'Oswaldo Ferreira2018-01-171-0/+61
|\
| * Merge branch '41567-projectfix' into 'security-10-3'Sean McGivern2018-01-161-0/+61
* | Merge branch '41727-target-branch-name' into 'master'Sean McGivern2018-01-171-0/+19
|\ \ | |/ |/|
| * Set target_branch to the ref branch when creating MR from issue41727-target-branch-nameJarka Kadlecová2018-01-171-0/+19
* | 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
View Lorry Controller Status