Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

1 files changed, 5 insertions, 12 deletions

diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb
index 9e64d2d43a2..098519cdffe 100644
--- a/app/presenters/project_presenter.rb
+++ b/app/presenters/project_presenter.rb
@@ -2,7 +2,6 @@
 
 class ProjectPresenter < Gitlab::View::Presenter::Delegated
   include ActionView::Helpers::NumberHelper
-  include ActionView::Helpers::UrlHelper
   include GitlabRoutingHelper
   include StorageHelper
   include TreeHelper
@@ -138,17 +137,6 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
     ide_edit_path(project, default_branch_or_main, 'README.md')
   end
 
-  def add_code_quality_ci_yml_path
-    add_special_file_path(
-      file_name: ci_config_path_or_default,
-      commit_message: s_("CommitMessage|Add %{file_name} and create a code quality job") % { file_name: ci_config_path_or_default },
-      additional_params: {
-        template: 'Code-Quality',
-        code_quality_walkthrough: true
-      }
-    )
-  end
-
   def license_short_name
     license = repository.license
     license&.nickname || license&.name || 'LICENSE'
@@ -473,6 +461,11 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
       project.topics.map(&:name)
     end
   end
+
+  # Avoid including ActionView::Helpers::UrlHelper
+  def content_tag(*args)
+    ActionController::Base.helpers.content_tag(*args)
+  end
 end
 
 ProjectPresenter.prepend_mod_with('ProjectPresenter')