summaryrefslogtreecommitdiff
path: root/app/models/commit.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-02-19 15:54:01 +0000
committerPhil Hughes <me@iamphill.com>2018-02-19 15:54:01 +0000
commit0f5b56f96151b47957e7c497d44f983a23863086 (patch)
tree4db39f420153447ef7a2554d6fc406ce09aedb17 /app/models/commit.rb
parent704ec01955e98c9098e5e57c2d0cb0c2493af5ad (diff)
parentfb2a76ac484f5bba305abdf7b54a18ee8133f63f (diff)
downloadgitlab-ce-ph-dispatcher-cleanup.tar.gz
Merge branch 'master' into ph-dispatcher-cleanupph-dispatcher-cleanup
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r--app/models/commit.rb8
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