summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-10-25 15:05:23 +0100
committerRobert Speicher <rspeicher@gmail.com>2016-10-25 15:05:23 +0100
commite396fef2b444db353b398213d205a404e3a92da0 (patch)
tree80a993630b6e42f3aa24e6da4b9186dab3ab73bf /app/models/merge_request.rb
parent9a6770388c0e93f98952a40cc88bb7f5ecd23631 (diff)
downloadgitlab-ce-rs-merge-request-helpers.tar.gz
Move `MergeRequest#state_icon_name` and `#state_human_name` to helpersrs-merge-request-helpers
These are entirely view-related and should therefore be view helpers.
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb20
1 files changed, 0 insertions, 20 deletions
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,