Commit 009e622c authored by Stan Hu's avatar Stan Hu

Fix application settings helpers not being loaded in FOSS

In https://gitlab.com/gitlab-org/gitlab/-/issues/324279, we saw a
failure only in the FOSS build because EE includes the
`ApplicationSettingsHelper` in the EE routing helper but FOSS does not.

Since the loading of this helper isn't really EE-specific, we ensure all
the includes are done in both EE and FOSS. This should eliminate subtle
differences between CE and EE code.

Relates to https://gitlab.com/gitlab-org/gitlab/-/issues/324279
parent 4c6e9e98
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
module GitlabRoutingHelper module GitlabRoutingHelper
extend ActiveSupport::Concern extend ActiveSupport::Concern
include ::ProjectsHelper
include ::ApplicationSettingsHelper
include API::Helpers::RelatedResourcesHelpers include API::Helpers::RelatedResourcesHelpers
included do included do
Gitlab::Routing.includes_helpers(self) Gitlab::Routing.includes_helpers(self)
......
...@@ -36,6 +36,8 @@ class Project < ApplicationRecord ...@@ -36,6 +36,8 @@ class Project < ApplicationRecord
include Integration include Integration
include Repositories::CanHousekeepRepository include Repositories::CanHousekeepRepository
include EachBatch include EachBatch
include GitlabRoutingHelper
extend Gitlab::Cache::RequestCache extend Gitlab::Cache::RequestCache
extend Gitlab::Utils::Override extend Gitlab::Utils::Override
......
...@@ -2,9 +2,6 @@ ...@@ -2,9 +2,6 @@
module EE module EE
module GitlabRoutingHelper module GitlabRoutingHelper
include ::ProjectsHelper
include ::ApplicationSettingsHelper
def geo_primary_web_url(container) def geo_primary_web_url(container)
File.join(::Gitlab::Geo.primary_node.url, container.full_path) File.join(::Gitlab::Geo.primary_node.url, container.full_path)
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