diff options
author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-02-09 10:32:42 -0500 |
---|---|---|
committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-02-16 13:51:19 -0500 |
commit | eef63813ea6a9585941be5f079104604d779d440 (patch) | |
tree | c8f821cbcd8750978e781c065847839d13332bab /app/models | |
parent | dfb14e4d22aa91d9d3fbcee5c7e44ae61bf18c51 (diff) | |
download | gitlab-ce-eef63813ea6a9585941be5f079104604d779d440.tar.gz |
stop ProcessCommitWorker from processing MR merge commit
When a merge request is merged, it creates a commit with the
description of the MR, which may contain references and issue
closing references. As this will be handled in the PostMergeService
anyways, let's ignore merge commit generated from a MR.
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/commit.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 8c960389652..add5fcf0e79 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -417,6 +417,10 @@ class Commit !!(title =~ WIP_REGEX) end + def merged_merge_request?(user) + !!merged_merge_request(user) + end + private def commit_reference(from, referable_commit_id, full: false) @@ -445,10 +449,6 @@ class Commit changes end - def merged_merge_request?(user) - !!merged_merge_request(user) - end - def merged_merge_request_no_cache(user) MergeRequestsFinder.new(user, project_id: project.id).find_by(merge_commit_sha: id) if merge_commit? end |