summaryrefslogtreecommitdiff
path: root/app/models/commit.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-02-22 12:09:27 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-02-22 12:09:27 +0000
commit011ddb51b40897bc13a75d78c9e992f559cbde48 (patch)
treed2f25aa76ab1466ecca82d2cf07e3594b8d7addc /app/models/commit.rb
parenta75cce1febf0403d66631841fff3bfbeefbfe6e3 (diff)
parenteb421c88ee2a57a437b9b14ba7447a04720354ac (diff)
downloadgitlab-ce-011ddb51b40897bc13a75d78c9e992f559cbde48.tar.gz
Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'
# Conflicts: # db/schema.rb
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