summaryrefslogtreecommitdiff
path: root/app/services/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flagOswaldo Ferreira2018-11-091-4/+0
* Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"osw-revert-comment-in-any-diff-lineOswaldo Ferreira2018-11-071-0/+4
* Merge branch 'bvl-patches-via-mail' into 'master'Douwe Maan2018-11-071-1/+5
|\
| * Allow limiting quick actions to executeBob Van Landuyt2018-11-071-1/+3
| * Apply patches when creating MR via emailBob Van Landuyt2018-11-071-1/+3
* | Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'mas...Douwe Maan2018-11-071-2/+2
|/
* Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'Douwe Maan2018-11-071-4/+0
|\
| * Comment on any expanded diff line on MRsOswaldo Ferreira2018-11-061-4/+0
* | Set @push early for EEee-1012-assign-code-owner-as-approverMark Chao2018-11-071-6/+6
* | Optimize merge request refresh by using the database to check commit SHAssh-optimize-mr-commit-sha-lookupStan Hu2018-11-021-5/+6
* | Add email for milestone changeChantal Rollison2018-11-021-0/+14
* | Avoidp loading merge request diff files when not neededStan Hu2018-11-011-1/+1
* | Significantly cut memory usage and SQL queries when reloading diffsStan Hu2018-11-011-1/+4
|/
* Merge branch 'sh-fix-issue-53153' into 'master'Sean McGivern2018-10-301-1/+6
|\
| * Fix extra merge request versions created from forked merge requestssh-fix-issue-53153Stan Hu2018-10-291-1/+6
* | Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'Douwe Maan2018-10-291-2/+2
|\ \ | |/ |/|
| * Make new merge request URL more friendly when pushing codeblackst0ne2018-10-231-2/+2
* | Extract EE-specific lines from MRs controllerextract-ee-specific-lines-for-issues-and-mr-controllersSean McGivern2018-10-261-0/+5
|/
* Fix CE to EE merge (backport)Kamil Trzciński2018-10-051-5/+6
* Extract git push from merge request refresh serviceGrzegorz Bizon2018-09-281-35/+24
* Add a class that represents a git push operationGrzegorz Bizon2018-09-281-3/+3
* Use standalone diff stats RPC on every comparison viewOswaldo Ferreira2018-09-191-2/+8
* Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-116-0/+16
* Merge branch 'osw-write-cache-upon-mr-creation-and-cache-refactoring' into 'm...Douwe Maan2018-09-071-2/+2
|\
| * Cache diff highlighting upon Merge Request creation (refactors diff caching)Oswaldo Ferreira2018-09-071-2/+2
* | Resolve "Migrate issue labels and milestone to related merge request"Tiago Botelho2018-09-062-5/+20
|/
* REFACTOR: Clarify assignment fallback chainFranz Liedke2018-08-251-6/+4
* REFACTOR: Use early return to flatten codeFranz Liedke2018-08-251-6/+5
* Fix fallback logic for automatic MR title assignmentFranz Liedke2018-08-251-1/+1
* Retrieve merge request closing issues from database cacheFelipe Artur2018-08-062-1/+2
* Enable more frozen string in app/services/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-apps-services-inner-moregfyoung2018-07-1724-3/+54
* Updates from `rubocop -a`Lin Jen-Shin2018-07-091-1/+1
* Merge branch 'add-more-rebase-logging' into 'master'Grzegorz Bizon2018-06-281-0/+8
|\
| * Add extra logging to githost.log when rebasingSean McGivern2018-06-281-0/+8
* | Mark MR as merged regardless of errors when closing issuesOswaldo Ferreira2018-06-271-1/+1
|/
* Delete non-latest merge request diff files upon diffs reloadosw-delete-non-latest-mr-diff-files-upon-mergeOswaldo Ferreira2018-06-244-17/+66
* Don't use Gitlab::Utils.nlbr in Gitlab::GitJacob Vosmaer (GitLab)2018-06-112-2/+2
* Resolve "Automatically created MR uses wrong target branch (when branching fr...Athar Hameed2018-06-081-1/+3
* Rephrase "maintainer" to more precise "members who can merge to the target br...42751-rename-mr-maintainer-pushMark Chao2018-06-011-2/+2
* Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-292-4/+41
* Merge branch 'ce-6127-move-merge-requests-services' into 'master'Rémy Coutable2018-05-241-2/+6
|\
| * Extract a do_execute method to be overriddence-6127-move-merge-requests-servicesLin Jen-Shin2018-05-241-2/+6
* | Create TODO when MR became unmergeablelulalala2018-05-171-5/+1
|/
* Merge branch 'jprovazn-generic-error' into 'master'Nick Thomas2018-05-021-10/+19
|\
| * Save and expose only generic merge errorJan Provaznik2018-05-021-10/+19
* | Move NotificationService calls to SidekiqSean McGivern2018-04-254-6/+11
|/
* 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