diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-10 20:04:53 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-10 20:04:53 +0300 |
| commit | ed87e6c68085bf84e9aa1661f049db27eff0a872 (patch) | |
| tree | 09264284445d890f4c669008af2ce5d3b3391f5e | |
| parent | 8f3c0490dd4b445dd4f97ddcfb1c051f93322401 (diff) | |
| parent | a1db70770ef16b60075ff9ca650eb34f0e002b92 (diff) | |
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
| -rw-r--r-- | app/models/merge_request.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 29f36570912..7b8858b24d6 100644 --- 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 |