Commit 0598fcf2 authored by James Fargher's avatar James Fargher

Merge branch 'eugie/remove-include-url-helper' into 'master'

Do not include ActionView::Helpers::UrlHelper

See merge request gitlab-org/gitlab!71172
parents aff5848f 90f7d33f
...@@ -2603,7 +2603,6 @@ Rails/IncludeUrlHelper: ...@@ -2603,7 +2603,6 @@ Rails/IncludeUrlHelper:
- 'ee/spec/lib/banzai/filter/cross_project_issuable_information_filter_spec.rb' - 'ee/spec/lib/banzai/filter/cross_project_issuable_information_filter_spec.rb'
- 'ee/spec/lib/banzai/filter/issuable_state_filter_spec.rb' - 'ee/spec/lib/banzai/filter/issuable_state_filter_spec.rb'
- 'lib/gitlab/ci/badge/metadata.rb' - 'lib/gitlab/ci/badge/metadata.rb'
- 'lib/gitlab/email/message/in_product_marketing/helper.rb'
- 'spec/helpers/merge_requests_helper_spec.rb' - 'spec/helpers/merge_requests_helper_spec.rb'
- 'spec/helpers/nav/top_nav_helper_spec.rb' - 'spec/helpers/nav/top_nav_helper_spec.rb'
- 'spec/helpers/notify_helper_spec.rb' - 'spec/helpers/notify_helper_spec.rb'
......
...@@ -50,7 +50,7 @@ module Gitlab ...@@ -50,7 +50,7 @@ module Gitlab
def cta_link def cta_link
case format case format
when :html when :html
link_to cta_text, group_email_campaigns_url(group, track: track, series: series), target: '_blank', rel: 'noopener noreferrer' ActionController::Base.helpers.link_to cta_text, group_email_campaigns_url(group, track: track, series: series), target: '_blank', rel: 'noopener noreferrer'
else else
[cta_text, group_email_campaigns_url(group, track: track, series: series)].join(' >> ') [cta_text, group_email_campaigns_url(group, track: track, series: series)].join(' >> ')
end end
...@@ -89,7 +89,7 @@ module Gitlab ...@@ -89,7 +89,7 @@ module Gitlab
case format case format
when :html when :html
links.map do |text, link| links.map do |text, link|
link_to(text, link) ActionController::Base.helpers.link_to(text, link)
end end
else else
'| ' + links.map do |text, link| '| ' + links.map do |text, link|
......
...@@ -7,7 +7,6 @@ module Gitlab ...@@ -7,7 +7,6 @@ module Gitlab
module Helper module Helper
include ActionView::Context include ActionView::Context
include ActionView::Helpers::TagHelper include ActionView::Helpers::TagHelper
include ActionView::Helpers::UrlHelper
private private
...@@ -32,7 +31,7 @@ module Gitlab ...@@ -32,7 +31,7 @@ module Gitlab
def link(text, link) def link(text, link)
case format case format
when :html when :html
link_to text, link ActionController::Base.helpers.link_to text, link
else else
"#{text} (#{link})" "#{text} (#{link})"
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment