diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-14 22:36:30 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-19 13:14:54 -0500 |
| commit | d34733efc4ac24979587a7ce6ac69db41a2003c3 (patch) | |
| tree | 6676c82cdc7736e37a36a9a083851a9c8c097c68 /app/models/merge_request.rb | |
| parent | e8d15f1339b1dac1c97516c320631e04c3e5e4d7 (diff) | |
| download | gitlab-ce-d34733efc4ac24979587a7ce6ac69db41a2003c3.tar.gz | |
Don't show revert button if commit/MR has already been reverted.
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 10 |
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 |