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 18:42:03 +0200 |
| commit | a1db70770ef16b60075ff9ca650eb34f0e002b92 (patch) | |
| tree | d15473c50dad25752ccf07d7245760873aa7da57 | |
| parent | 37be2007f9aa6197c1304a450110aecbde5434f9 (diff) | |
| download | gitlab-ce-a1db70770ef16b60075ff9ca650eb34f0e002b92.tar.gz | |
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 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 |