summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher2018-06-051-6/+6
|\
| * Rephrase "maintainer" to more precise "members who can merge to the target br...42751-rename-mr-maintainer-pushMark Chao2018-06-011-6/+6
* | Resolve "Update `updated_at` on an issue/mr on every issue/mr changes"🙈 jacopo beschi 🙉2018-06-011-1/+7
|/
* Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-292-13/+246
* Create TODO when MR became unmergeablelulalala2018-05-171-26/+0
* Add cannot_be_merged_recheck merge_statuslulalala2018-05-171-1/+1
* Save and expose only generic merge errorJan Provaznik2018-05-021-2/+2
* Prevent new merge requests for archived projectsBob Van Landuyt2018-04-111-1/+23
* Fix 500 error when MR from fork has conflicts but worker has not runfix-500-error-when-mr-ref-is-not-yet-fetchedSean McGivern2018-04-061-0/+16
* Send notification emails when push to a merge requestYarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-to-the-merge-requestYarNayar2018-03-261-0/+21
* Only cache MR diffs for one week44191-reduce-redis-usage-from-merge-request-diffs-cachingSean McGivern2018-03-151-2/+2
* Only cache highlight results for latest MR diffsSean McGivern2018-03-151-8/+28
* Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-071-0/+37
* Merge branch 'wip-slash-command-on-mr-description' into 'master'Rémy Coutable2018-03-051-0/+35
|\
| * /wip slash command on MR creationAdam Pahlevi2018-03-011-0/+35
* | Fetch commit signatures from Gitaly in batchesfeature/fetch-commit-signs-from-gitaly-in-batchAhmad Sherif2018-03-011-2/+2
|/
* Port `read_cross_project` ability from EEBob Van Landuyt2018-02-221-1/+1
* Fix closing issues text added to MRs for external issue trackersSean McGivern2018-02-141-117/+55
* Fix Error 500s creating merge requests with external issue trackersh-fix-issue-43193Stan Hu2018-02-121-11/+21
* 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
|/
View Lorry Controller Status