Merge branch 'sh-fix-ce-application-settings-helper' into 'master'

[RUN ALL RSPEC] Fix application settings helpers not being loaded in FOSS

See merge request gitlab-org/gitlab!56544

app/helpers/gitlab_routing_helper.rb

@@ -4,6 +4,8 @@
 module GitlabRoutingHelper
   extend ActiveSupport::Concern
 
+  include ::ProjectsHelper
+  include ::ApplicationSettingsHelper
   include API::Helpers::RelatedResourcesHelpers
   included do
     Gitlab::Routing.includes_helpers(self)

app/models/project.rb

@@ -36,6 +36,8 @@ class Project < ApplicationRecord
   include Integration
   include Repositories::CanHousekeepRepository
   include EachBatch
+  include GitlabRoutingHelper
+
   extend Gitlab::Cache::RequestCache
   extend Gitlab::Utils::Override
 

ee/app/helpers/ee/gitlab_routing_helper.rb

@@ -2,9 +2,6 @@
 
 module EE
   module GitlabRoutingHelper
-    include ::ProjectsHelper
-    include ::ApplicationSettingsHelper
-
     def geo_primary_web_url(container)
       File.join(::Gitlab::Geo.primary_node.url, container.full_path)
     end

ee/app/models/ee/project.rb

@@ -843,5 +843,3 @@ module EE
     end
   end
 end
-
-EE::Project.include_if_ee('::EE::GitlabRoutingHelper')