From a1db70770ef16b60075ff9ca650eb34f0e002b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Fri, 10 Jun 2016 15:21:02 +0200 Subject: Remove unused MergeRequest#gitlab_merge_status method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- app/models/merge_request.rb | 8 -------- 1 file changed, 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 -- cgit v1.2.1