Commit ed87e6c6 authored by Robert Speicher's avatar Robert Speicher

Merge branch '18462-remove-unused-mergerequest-gitlab_merge_status-method' into 'master'

Remove unused MergeRequest#gitlab_merge_status method

Closes #18462.

See merge request !4593
parents 8f3c0490 a1db7077
Pipeline #3496546 passed with stages
in 946 minutes and 55 seconds
......@@ -276,14 +276,6 @@ class MergeRequest < ActiveRecord::Base
true
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)
can_be_merged_by?(current_user) || self.author == current_user
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