diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-10 15:21:02 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-10 15:21:02 +0200 |
| commit | c1c90e8cd94c87c32bc9ecbdf88a10f5483889bf (patch) | |
| tree | 526522c91550a702d5b34c8f5a5efa471f182ae4 | |
| parent | 9734b8bb563dae3a203f8e0c3bc6d80fd9cad400 (diff) | |
| download | gitlab-ce-18462-remove-unused-mergerequest-gitlab_merge_status-method.tar.gz | |
Remove unused MergeRequest#gitlab_merge_status method18462-remove-unused-mergerequest-gitlab_merge_status-method
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -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 b0ed8182855..062a675f7d7 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -267,14 +267,6 @@ class MergeRequest < ActiveRecord::Base can_be_merged? 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 |