summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 8eb201b154d..82d096989cf 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -533,4 +533,14 @@ class MergeRequest < ActiveRecord::Base
[diff_base_commit, last_commit]
end
+
+ def merge_commit
+ @merge_commit ||= project.commit(merge_commit_sha) if merge_commit_sha
+ end
+
+ def has_been_reverted?(current_user = nil)
+ if merge_commit
+ merge_commit.has_been_reverted?(current_user, self)
+ end
+ end
end