Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 4 deletions

diff --git a/spec/lib/banzai/filter/reference_redactor_filter_spec.rb b/spec/lib/banzai/filter/reference_redactor_filter_spec.rb
index d0336e9e059..a2f34d42814 100644
--- a/spec/lib/banzai/filter/reference_redactor_filter_spec.rb
+++ b/spec/lib/banzai/filter/reference_redactor_filter_spec.rb
@@ -3,7 +3,6 @@
 require 'spec_helper'
 
 RSpec.describe Banzai::Filter::ReferenceRedactorFilter do
-  include ActionView::Helpers::UrlHelper
   include FilterSpecHelper
 
   it 'ignores non-GFM links' do
@@ -14,7 +13,7 @@ RSpec.describe Banzai::Filter::ReferenceRedactorFilter do
   end
 
   def reference_link(data)
-    link_to('text', '', class: 'gfm', data: data)
+    ActionController::Base.helpers.link_to('text', '', class: 'gfm', data: data)
   end
 
   it 'skips when the skip_redaction flag is set' do
diff --git a/spec/lib/banzai/reference_redactor_spec.rb b/spec/lib/banzai/reference_redactor_spec.rb
index 78cceedd0e5..45e14032a98 100644
--- a/spec/lib/banzai/reference_redactor_spec.rb
+++ b/spec/lib/banzai/reference_redactor_spec.rb
@@ -106,13 +106,12 @@ RSpec.describe Banzai::ReferenceRedactor do
   end
 
   context 'when the user cannot read cross project' do
-    include ActionView::Helpers::UrlHelper
     let(:project) { create(:project) }
     let(:other_project) { create(:project, :public) }
 
     def create_link(issuable)
       type = issuable.class.name.underscore.downcase
-      link_to(issuable.to_reference, '',
+      ActionController::Base.helpers.link_to(issuable.to_reference, '',
               class: 'gfm has-tooltip',
               title: issuable.title,
               data: {