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

Merge branch '18462-remove-unused-mergerequest-gitlab_merge_status-method' into 'master'
ed87e6c6 · Robert Speicher · 8f3c0490 · a1db7077 · ed87e6c6
Commit ed87e6c6 authored Jun 10, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 8 deletions

merge_request.rb app/models/merge_request.rb +0 -8

No files found.
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -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