summaryrefslogtreecommitdiff
path: root/app/helpers/merge_requests_helper.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers/merge_requests_helper.rb')
-rw-r--r--app/helpers/merge_requests_helper.rb12
1 files changed, 1 insertions, 11 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index df7fcb0f3da..514f5fafd65 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -29,16 +29,6 @@ module MergeRequestsHelper
classes.join(' ')
end
- def state_name_with_icon(merge_request)
- if merge_request.merged?
- [_("Merged"), "git-merge"]
- elsif merge_request.closed?
- [_("Closed"), "close"]
- else
- [_("Open"), "issue-open-m"]
- end
- end
-
def merge_path_description(merge_request, separator)
if merge_request.for_fork?
"Project:Branches: #{@merge_request.source_project_path}:#{@merge_request.source_branch} #{separator} #{@merge_request.target_project.full_path}:#{@merge_request.target_branch}"
@@ -223,4 +213,4 @@ module MergeRequestsHelper
end
end
-MergeRequestsHelper.prepend_if_ee('EE::MergeRequestsHelper')
+MergeRequestsHelper.prepend_mod_with('MergeRequestsHelper')