From e396fef2b444db353b398213d205a404e3a92da0 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Tue, 25 Oct 2016 15:05:23 +0100 Subject: Move `MergeRequest#state_icon_name` and `#state_human_name` to helpers These are entirely view-related and should therefore be view helpers. --- app/models/merge_request.rb | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'app/models/merge_request.rb') diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 4872f8b8649..73cf8b1ebde 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -694,26 +694,6 @@ class MergeRequest < ActiveRecord::Base end end - def state_human_name - if merged? - "Merged" - elsif closed? - "Closed" - else - "Open" - end - end - - def state_icon_name - if merged? - "check" - elsif closed? - "times" - else - "circle-o" - end - end - def fetch_ref target_project.repository.fetch_ref( source_project.repository.path_to_repo, -- cgit v1.2.1