Commit a1db7077 authored by Rémy Coutable's avatar Rémy Coutable

Remove unused MergeRequest#gitlab_merge_status method

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 37be2007
...@@ -276,14 +276,6 @@ class MergeRequest < ActiveRecord::Base ...@@ -276,14 +276,6 @@ class MergeRequest < ActiveRecord::Base
true true
end end
def gitlab_merge_status
if work_in_progress?
"work_in_progress"
else
merge_status_name
end
end
def can_cancel_merge_when_build_succeeds?(current_user) def can_cancel_merge_when_build_succeeds?(current_user)
can_be_merged_by?(current_user) || self.author == current_user can_be_merged_by?(current_user) || self.author == current_user
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment