Add latest changes from gitlab-org/gitlab@master

58 files changed, 62 insertions, 62 deletions

diff --git a/app/helpers/analytics/navbar_helper.rb b/app/helpers/analytics/navbar_helper.rb
index 4c7ded1ba18..091571ff15a 100644
--- a/app/helpers/analytics/navbar_helper.rb
+++ b/app/helpers/analytics/navbar_helper.rb
@@ -25,4 +25,4 @@ module Analytics
   end
 end
 
-Analytics::NavbarHelper.prepend_if_ee('EE::Analytics::NavbarHelper')
+Analytics::NavbarHelper.prepend_mod_with('Analytics::NavbarHelper')
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 90f5ab5f647..0e3dff27da9 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -438,8 +438,8 @@ module ApplicationSettingsHelper
   end
 end
 
-ApplicationSettingsHelper.prepend_if_ee('EE::ApplicationSettingsHelper')
+ApplicationSettingsHelper.prepend_mod_with('ApplicationSettingsHelper')
 
 # The methods in `EE::ApplicationSettingsHelper` should be available as both
 # instance and class methods.
-ApplicationSettingsHelper.extend_if_ee('EE::ApplicationSettingsHelper')
+ApplicationSettingsHelper.extend_mod_with('ApplicationSettingsHelper')
diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb
index 7cfe8ffb266..cb251961363 100644
--- a/app/helpers/auth_helper.rb
+++ b/app/helpers/auth_helper.rb
@@ -191,8 +191,8 @@ module AuthHelper
   extend self
 end
 
-AuthHelper.prepend_if_ee('EE::AuthHelper')
+AuthHelper.prepend_mod_with('AuthHelper')
 
 # The methods added in EE should be available as both class and instance
 # methods, just like the methods provided by `AuthHelper` itself.
-AuthHelper.extend_if_ee('EE::AuthHelper')
+AuthHelper.extend_mod_with('AuthHelper')
diff --git a/app/helpers/award_emoji_helper.rb b/app/helpers/award_emoji_helper.rb
index af9ab93d459..196415bb363 100644
--- a/app/helpers/award_emoji_helper.rb
+++ b/app/helpers/award_emoji_helper.rb
@@ -17,4 +17,4 @@ module AwardEmojiHelper
   end
 end
 
-AwardEmojiHelper.prepend_if_ee('EE::AwardEmojiHelper')
+AwardEmojiHelper.prepend_mod_with('AwardEmojiHelper')
diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb
index 8815385546a..6c4889de602 100644
--- a/app/helpers/boards_helper.rb
+++ b/app/helpers/boards_helper.rb
@@ -140,4 +140,4 @@ module BoardsHelper
   end
 end
 
-BoardsHelper.prepend_if_ee('EE::BoardsHelper')
+BoardsHelper.prepend_mod_with('BoardsHelper')
diff --git a/app/helpers/branches_helper.rb b/app/helpers/branches_helper.rb
index 8f87cd5bfe0..a500a695029 100644
--- a/app/helpers/branches_helper.rb
+++ b/app/helpers/branches_helper.rb
@@ -22,4 +22,4 @@ module BranchesHelper
   end
 end
 
-BranchesHelper.prepend_if_ee('EE::BranchesHelper')
+BranchesHelper.prepend_mod_with('BranchesHelper')
diff --git a/app/helpers/button_helper.rb b/app/helpers/button_helper.rb
index 1b00f583b55..27d6ee57d8b 100644
--- a/app/helpers/button_helper.rb
+++ b/app/helpers/button_helper.rb
@@ -100,4 +100,4 @@ module ButtonHelper
   end
 end
 
-ButtonHelper.prepend_if_ee('EE::ButtonHelper')
+ButtonHelper.prepend_mod_with('ButtonHelper')
diff --git a/app/helpers/ci/jobs_helper.rb b/app/helpers/ci/jobs_helper.rb
index a0d169c1358..a0beaa49db8 100644
--- a/app/helpers/ci/jobs_helper.rb
+++ b/app/helpers/ci/jobs_helper.rb
@@ -36,4 +36,4 @@ module Ci
   end
 end
 
-Ci::JobsHelper.prepend_if_ee('::EE::Ci::JobsHelper')
+Ci::JobsHelper.prepend_mod_with('Ci::JobsHelper')
diff --git a/app/helpers/ci/pipeline_editor_helper.rb b/app/helpers/ci/pipeline_editor_helper.rb
index c31f7843e40..c9a41e35af8 100644
--- a/app/helpers/ci/pipeline_editor_helper.rb
+++ b/app/helpers/ci/pipeline_editor_helper.rb
@@ -33,4 +33,4 @@ module Ci
   end
 end
 
-Ci::PipelineEditorHelper.prepend_if_ee('EE::Ci::PipelineEditorHelper')
+Ci::PipelineEditorHelper.prepend_mod_with('Ci::PipelineEditorHelper')
diff --git a/app/helpers/ci/runners_helper.rb b/app/helpers/ci/runners_helper.rb
index 82347053d6f..550fa4de2c5 100644
--- a/app/helpers/ci/runners_helper.rb
+++ b/app/helpers/ci/runners_helper.rb
@@ -75,4 +75,4 @@ module Ci
   end
 end
 
-Ci::RunnersHelper.prepend_if_ee('EE::Ci::RunnersHelper')
+Ci::RunnersHelper.prepend_mod_with('Ci::RunnersHelper')
diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb
index 08f357916b5..95bbf2eff41 100644
--- a/app/helpers/dashboard_helper.rb
+++ b/app/helpers/dashboard_helper.rb
@@ -66,4 +66,4 @@ module DashboardHelper
   end
 end
 
-DashboardHelper.prepend_if_ee('EE::DashboardHelper')
+DashboardHelper.prepend_mod_with('DashboardHelper')
diff --git a/app/helpers/emails_helper.rb b/app/helpers/emails_helper.rb
index b58ff21b257..0b1bdb68e50 100644
--- a/app/helpers/emails_helper.rb
+++ b/app/helpers/emails_helper.rb
@@ -298,4 +298,4 @@ module EmailsHelper
   end
 end
 
-EmailsHelper.prepend_if_ee('EE::EmailsHelper')
+EmailsHelper.prepend_mod_with('EmailsHelper')
diff --git a/app/helpers/environments_helper.rb b/app/helpers/environments_helper.rb
index 7f0c59f65a0..aa1c3786596 100644
--- a/app/helpers/environments_helper.rb
+++ b/app/helpers/environments_helper.rb
@@ -117,4 +117,4 @@ module EnvironmentsHelper
   end
 end
 
-EnvironmentsHelper.prepend_if_ee('::EE::EnvironmentsHelper')
+EnvironmentsHelper.prepend_mod_with('EnvironmentsHelper')
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 1f49452ed7e..03c3ee3363d 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -290,4 +290,4 @@ module EventsHelper
   end
 end
 
-EventsHelper.prepend_if_ee('EE::EventsHelper')
+EventsHelper.prepend_mod_with('EventsHelper')
diff --git a/app/helpers/export_helper.rb b/app/helpers/export_helper.rb
index 38a4f7f1b4b..92d06471384 100644
--- a/app/helpers/export_helper.rb
+++ b/app/helpers/export_helper.rb
@@ -25,4 +25,4 @@ module ExportHelper
   end
 end
 
-ExportHelper.prepend_if_ee('EE::ExportHelper')
+ExportHelper.prepend_mod_with('ExportHelper')
diff --git a/app/helpers/feature_flags_helper.rb b/app/helpers/feature_flags_helper.rb
index e50191a471f..2b8804bc07e 100644
--- a/app/helpers/feature_flags_helper.rb
+++ b/app/helpers/feature_flags_helper.rb
@@ -16,4 +16,4 @@ module FeatureFlagsHelper
   end
 end
 
-FeatureFlagsHelper.prepend_if_ee('::EE::FeatureFlagsHelper')
+FeatureFlagsHelper.prepend_mod_with('FeatureFlagsHelper')
diff --git a/app/helpers/form_helper.rb b/app/helpers/form_helper.rb
index d0276c91316..cf3e99eee49 100644
--- a/app/helpers/form_helper.rb
+++ b/app/helpers/form_helper.rb
@@ -131,4 +131,4 @@ module FormHelper
   end
 end
 
-FormHelper.prepend_if_ee('::EE::FormHelper')
+FormHelper.prepend_mod_with('FormHelper')
diff --git a/app/helpers/gitlab_routing_helper.rb b/app/helpers/gitlab_routing_helper.rb
index 36a565c221d..0a684d92eb1 100644
--- a/app/helpers/gitlab_routing_helper.rb
+++ b/app/helpers/gitlab_routing_helper.rb
@@ -384,4 +384,4 @@ module GitlabRoutingHelper
   end
 end
 
-GitlabRoutingHelper.include_if_ee('EE::GitlabRoutingHelper')
+GitlabRoutingHelper.include_mod_with('GitlabRoutingHelper')
diff --git a/app/helpers/graph_helper.rb b/app/helpers/graph_helper.rb
index bcbc67957eb..3a94f7d47c2 100644
--- a/app/helpers/graph_helper.rb
+++ b/app/helpers/graph_helper.rb
@@ -28,4 +28,4 @@ module GraphHelper
   end
 end
 
-GraphHelper.prepend_if_ee('EE::GraphHelper')
+GraphHelper.prepend_mod_with('GraphHelper')
diff --git a/app/helpers/groups/group_members_helper.rb b/app/helpers/groups/group_members_helper.rb
index 061ad7d0d3b..79191616c8f 100644
--- a/app/helpers/groups/group_members_helper.rb
+++ b/app/helpers/groups/group_members_helper.rb
@@ -54,4 +54,4 @@ module Groups::GroupMembersHelper
   end
 end
 
-Groups::GroupMembersHelper.prepend_if_ee('EE::Groups::GroupMembersHelper')
+Groups::GroupMembersHelper.prepend_mod_with('Groups::GroupMembersHelper')
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
index 1541aea021e..33eba3d6b3c 100644
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -343,4 +343,4 @@ module GroupsHelper
   end
 end
 
-GroupsHelper.prepend_if_ee('EE::GroupsHelper')
+GroupsHelper.prepend_mod_with('GroupsHelper')
diff --git a/app/helpers/hooks_helper.rb b/app/helpers/hooks_helper.rb
index 9466a37ed93..2725d28c47c 100644
--- a/app/helpers/hooks_helper.rb
+++ b/app/helpers/hooks_helper.rb
@@ -38,4 +38,4 @@ module HooksHelper
   end
 end
 
-HooksHelper.prepend_if_ee('EE::HooksHelper')
+HooksHelper.prepend_mod_with('HooksHelper')
diff --git a/app/helpers/ide_helper.rb b/app/helpers/ide_helper.rb
index a38ab97e59c..d1c84bd4141 100644
--- a/app/helpers/ide_helper.rb
+++ b/app/helpers/ide_helper.rb
@@ -43,4 +43,4 @@ module IdeHelper
   end
 end
 
-::IdeHelper.prepend_if_ee('::EE::IdeHelper')
+::IdeHelper.prepend_mod_with('IdeHelper')
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index cb54437f941..c662dabe453 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -426,4 +426,4 @@ module IssuablesHelper
   end
 end
 
-IssuablesHelper.prepend_if_ee('EE::IssuablesHelper')
+IssuablesHelper.prepend_mod_with('IssuablesHelper')
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 06a26760365..6b693125f4d 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -209,4 +209,4 @@ module IssuesHelper
   end
 end
 
-IssuesHelper.prepend_if_ee('EE::IssuesHelper')
+IssuesHelper.prepend_mod_with('IssuesHelper')
diff --git a/app/helpers/kerberos_spnego_helper.rb b/app/helpers/kerberos_spnego_helper.rb
index ed09ed755fe..0f6812bc31b 100644
--- a/app/helpers/kerberos_spnego_helper.rb
+++ b/app/helpers/kerberos_spnego_helper.rb
@@ -10,4 +10,4 @@ module KerberosSpnegoHelper
   end
 end
 
-KerberosSpnegoHelper.prepend_if_ee('EE::KerberosSpnegoHelper')
+KerberosSpnegoHelper.prepend_mod_with('KerberosSpnegoHelper')
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index cfc4075100b..2150729cb2a 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -275,4 +275,4 @@ module LabelsHelper
   end
 end
 
-LabelsHelper.prepend_if_ee('EE::LabelsHelper')
+LabelsHelper.prepend_mod_with('LabelsHelper')
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb
index ad206d0e5b5..05a55a09271 100644
--- a/app/helpers/markup_helper.rb
+++ b/app/helpers/markup_helper.rb
@@ -318,4 +318,4 @@ module MarkupHelper
   extend self
 end
 
-MarkupHelper.prepend_if_ee('EE::MarkupHelper')
+MarkupHelper.prepend_mod_with('MarkupHelper')
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index af8d6da4d84..514f5fafd65 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -213,4 +213,4 @@ module MergeRequestsHelper
   end
 end
 
-MergeRequestsHelper.prepend_if_ee('EE::MergeRequestsHelper')
+MergeRequestsHelper.prepend_mod_with('MergeRequestsHelper')
diff --git a/app/helpers/mirror_helper.rb b/app/helpers/mirror_helper.rb
index 9d23ab87b98..3dfd30f07db 100644
--- a/app/helpers/mirror_helper.rb
+++ b/app/helpers/mirror_helper.rb
@@ -17,4 +17,4 @@ module MirrorHelper
   end
 end
 
-MirrorHelper.prepend_if_ee('EE::MirrorHelper')
+MirrorHelper.prepend_mod_with('MirrorHelper')
diff --git a/app/helpers/namespace_storage_limit_alert_helper.rb b/app/helpers/namespace_storage_limit_alert_helper.rb
index d7174c38254..ed11f89a7dd 100644
--- a/app/helpers/namespace_storage_limit_alert_helper.rb
+++ b/app/helpers/namespace_storage_limit_alert_helper.rb
@@ -6,4 +6,4 @@ module NamespaceStorageLimitAlertHelper
   end
 end
 
-NamespaceStorageLimitAlertHelper.prepend_if_ee('EE::NamespaceStorageLimitAlertHelper')
+NamespaceStorageLimitAlertHelper.prepend_mod_with('NamespaceStorageLimitAlertHelper')
diff --git a/app/helpers/namespaces_helper.rb b/app/helpers/namespaces_helper.rb
index cf5fdc091af..39a8f506ba2 100644
--- a/app/helpers/namespaces_helper.rb
+++ b/app/helpers/namespaces_helper.rb
@@ -125,4 +125,4 @@ module NamespacesHelper
   end
 end
 
-NamespacesHelper.prepend_if_ee('EE::NamespacesHelper')
+NamespacesHelper.prepend_mod_with('NamespacesHelper')
diff --git a/app/helpers/nav/top_nav_helper.rb b/app/helpers/nav/top_nav_helper.rb
index 1101a345bc0..386610e74b0 100644
--- a/app/helpers/nav/top_nav_helper.rb
+++ b/app/helpers/nav/top_nav_helper.rb
@@ -139,4 +139,4 @@ module Nav
   end
 end
 
-Nav::TopNavHelper.prepend_ee_mod
+Nav::TopNavHelper.prepend_mod
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index df8c5b44599..0e5822a7c6f 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -101,4 +101,4 @@ module NavHelper
   end
 end
 
-NavHelper.prepend_if_ee('EE::NavHelper')
+NavHelper.prepend_mod_with('NavHelper')
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 62580124c0f..fff7e5d1c7f 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -215,4 +215,4 @@ module NotesHelper
   end
 end
 
-NotesHelper.prepend_if_ee('EE::NotesHelper')
+NotesHelper.prepend_mod_with('NotesHelper')
diff --git a/app/helpers/operations_helper.rb b/app/helpers/operations_helper.rb
index 51f4304911b..df07baa2d03 100644
--- a/app/helpers/operations_helper.rb
+++ b/app/helpers/operations_helper.rb
@@ -44,4 +44,4 @@ module OperationsHelper
   end
 end
 
-OperationsHelper.prepend_if_ee('EE::OperationsHelper')
+OperationsHelper.prepend_mod_with('OperationsHelper')
diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb
index 6fc2dfb597b..d851ed3db8f 100644
--- a/app/helpers/preferences_helper.rb
+++ b/app/helpers/preferences_helper.rb
@@ -121,4 +121,4 @@ module PreferencesHelper
   end
 end
 
-PreferencesHelper.prepend_if_ee('EE::PreferencesHelper')
+PreferencesHelper.prepend_mod_with('PreferencesHelper')
diff --git a/app/helpers/profiles_helper.rb b/app/helpers/profiles_helper.rb
index 3219620de71..f6ed567c9ea 100644
--- a/app/helpers/profiles_helper.rb
+++ b/app/helpers/profiles_helper.rb
@@ -51,4 +51,4 @@ module ProfilesHelper
   end
 end
 
-ProfilesHelper.prepend_ee_mod
+ProfilesHelper.prepend_mod
diff --git a/app/helpers/projects/incidents_helper.rb b/app/helpers/projects/incidents_helper.rb
index 63504cb55b9..dde2980817f 100644
--- a/app/helpers/projects/incidents_helper.rb
+++ b/app/helpers/projects/incidents_helper.rb
@@ -16,4 +16,4 @@ module Projects::IncidentsHelper
   end
 end
 
-Projects::IncidentsHelper.prepend_if_ee('EE::Projects::IncidentsHelper')
+Projects::IncidentsHelper.prepend_mod_with('Projects::IncidentsHelper')
diff --git a/app/helpers/projects/security/configuration_helper.rb b/app/helpers/projects/security/configuration_helper.rb
index 265d46cbc41..dee106ab3ae 100644
--- a/app/helpers/projects/security/configuration_helper.rb
+++ b/app/helpers/projects/security/configuration_helper.rb
@@ -10,4 +10,4 @@ module Projects
   end
 end
 
-::Projects::Security::ConfigurationHelper.prepend_if_ee('::EE::Projects::Security::ConfigurationHelper')
+::Projects::Security::ConfigurationHelper.prepend_mod_with('Projects::Security::ConfigurationHelper')
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 24ed1db86ba..f2a50ce1325 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -651,4 +651,4 @@ module ProjectsHelper
   end
 end
 
-ProjectsHelper.prepend_if_ee('EE::ProjectsHelper')
+ProjectsHelper.prepend_mod_with('ProjectsHelper')
diff --git a/app/helpers/releases_helper.rb b/app/helpers/releases_helper.rb
index d9851564585..de9288121c4 100644
--- a/app/helpers/releases_helper.rb
+++ b/app/helpers/releases_helper.rb
@@ -72,4 +72,4 @@ module ReleasesHelper
   end
 end
 
-ReleasesHelper.prepend_if_ee('EE::ReleasesHelper')
+ReleasesHelper.prepend_mod_with('ReleasesHelper')
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 8a869bd7323..1f4c98d6f28 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -431,4 +431,4 @@ module SearchHelper
   end
 end
 
-SearchHelper.prepend_if_ee('EE::SearchHelper')
+SearchHelper.prepend_mod_with('SearchHelper')
diff --git a/app/helpers/selects_helper.rb b/app/helpers/selects_helper.rb
index 4d0f9e530fb..88aff31af54 100644
--- a/app/helpers/selects_helper.rb
+++ b/app/helpers/selects_helper.rb
@@ -91,4 +91,4 @@ module SelectsHelper
   end
 end
 
-SelectsHelper.prepend_if_ee('EE::SelectsHelper')
+SelectsHelper.prepend_mod_with('SelectsHelper')
diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb
index b197d8e1f7a..3d3ab3a6972 100644
--- a/app/helpers/services_helper.rb
+++ b/app/helpers/services_helper.rb
@@ -178,8 +178,8 @@ module ServicesHelper
   end
 end
 
-ServicesHelper.prepend_if_ee('EE::ServicesHelper')
+ServicesHelper.prepend_mod_with('ServicesHelper')
 
 # The methods in `EE::ServicesHelper` should be available as both instance and
 # class methods.
-ServicesHelper.extend_if_ee('EE::ServicesHelper')
+ServicesHelper.extend_mod_with('ServicesHelper')
diff --git a/app/helpers/sidebars_helper.rb b/app/helpers/sidebars_helper.rb
index 0c9e3287e28..0fc306a3f2e 100644
--- a/app/helpers/sidebars_helper.rb
+++ b/app/helpers/sidebars_helper.rb
@@ -48,4 +48,4 @@ module SidebarsHelper
   end
 end
 
-SidebarsHelper.prepend_if_ee('EE::SidebarsHelper')
+SidebarsHelper.prepend_mod_with('SidebarsHelper')
diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb
index 974ec046bbb..0bb9e9e9bdd 100644
--- a/app/helpers/sorting_helper.rb
+++ b/app/helpers/sorting_helper.rb
@@ -301,4 +301,4 @@ module SortingHelper
   end
 end
 
-SortingHelper.prepend_if_ee('::EE::SortingHelper')
+SortingHelper.prepend_mod_with('SortingHelper')
diff --git a/app/helpers/sorting_titles_values_helper.rb b/app/helpers/sorting_titles_values_helper.rb
index 651a6437479..28d70f1db45 100644
--- a/app/helpers/sorting_titles_values_helper.rb
+++ b/app/helpers/sorting_titles_values_helper.rb
@@ -328,4 +328,4 @@ module SortingTitlesValuesHelper
   end
 end
 
-SortingHelper.include_if_ee('::EE::SortingTitlesValuesHelper')
+SortingHelper.include_mod_with('SortingTitlesValuesHelper')
diff --git a/app/helpers/subscribable_banner_helper.rb b/app/helpers/subscribable_banner_helper.rb
index c9d4370f8ad..d9251fb3f21 100644
--- a/app/helpers/subscribable_banner_helper.rb
+++ b/app/helpers/subscribable_banner_helper.rb
@@ -6,4 +6,4 @@ module SubscribableBannerHelper
   end
 end
 
-SubscribableBannerHelper.prepend_if_ee('EE::SubscribableBannerHelper')
+SubscribableBannerHelper.prepend_mod_with('SubscribableBannerHelper')
diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb
index 85e644967ea..521423fbb94 100644
--- a/app/helpers/system_note_helper.rb
+++ b/app/helpers/system_note_helper.rb
@@ -54,8 +54,8 @@ module SystemNoteHelper
   extend self
 end
 
-SystemNoteHelper.prepend_if_ee('EE::SystemNoteHelper')
+SystemNoteHelper.prepend_mod_with('SystemNoteHelper')
 
 # The methods in `EE::SystemNoteHelper` should be available as both instance and
 # class methods.
-SystemNoteHelper.extend_if_ee('EE::SystemNoteHelper')
+SystemNoteHelper.extend_mod_with('SystemNoteHelper')
diff --git a/app/helpers/timeboxes_helper.rb b/app/helpers/timeboxes_helper.rb
index e034a985b50..0993e210f42 100644
--- a/app/helpers/timeboxes_helper.rb
+++ b/app/helpers/timeboxes_helper.rb
@@ -288,4 +288,4 @@ module TimeboxesHelper
   end
 end
 
-TimeboxesHelper.prepend_if_ee('EE::TimeboxesHelper')
+TimeboxesHelper.prepend_mod_with('TimeboxesHelper')
diff --git a/app/helpers/timeboxes_routing_helper.rb b/app/helpers/timeboxes_routing_helper.rb
index 6fb5a1a3185..6a5bef74dc9 100644
--- a/app/helpers/timeboxes_routing_helper.rb
+++ b/app/helpers/timeboxes_routing_helper.rb
@@ -18,4 +18,4 @@ module TimeboxesRoutingHelper
   end
 end
 
-TimeboxesRoutingHelper.prepend_if_ee('EE::TimeboxesRoutingHelper')
+TimeboxesRoutingHelper.prepend_mod_with('TimeboxesRoutingHelper')
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index e9a0fef06c4..6feb3b1cbe9 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -232,4 +232,4 @@ module TodosHelper
   end
 end
 
-TodosHelper.prepend_if_ee('EE::TodosHelper')
+TodosHelper.prepend_mod_with('TodosHelper')
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index b795851ba30..54c03d3d966 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -205,4 +205,4 @@ module TreeHelper
   end
 end
 
-TreeHelper.prepend_if_ee('::EE::TreeHelper')
+TreeHelper.prepend_mod_with('TreeHelper')
diff --git a/app/helpers/user_callouts_helper.rb b/app/helpers/user_callouts_helper.rb
index 7a90984cd77..a7fa880503e 100644
--- a/app/helpers/user_callouts_helper.rb
+++ b/app/helpers/user_callouts_helper.rb
@@ -80,4 +80,4 @@ module UserCalloutsHelper
   end
 end
 
-UserCalloutsHelper.prepend_if_ee('EE::UserCalloutsHelper')
+UserCalloutsHelper.prepend_mod_with('UserCalloutsHelper')
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 16222b1c863..998c697e617 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -322,4 +322,4 @@ module UsersHelper
   end
 end
 
-UsersHelper.prepend_if_ee('EE::UsersHelper')
+UsersHelper.prepend_mod_with('UsersHelper')
diff --git a/app/helpers/version_check_helper.rb b/app/helpers/version_check_helper.rb
index bac3c99e3e5..12a812b373b 100644
--- a/app/helpers/version_check_helper.rb
+++ b/app/helpers/version_check_helper.rb
@@ -23,4 +23,4 @@ module VersionCheckHelper
   end
 end
 
-VersionCheckHelper.prepend_if_ee('EE::VersionCheckHelper')
+VersionCheckHelper.prepend_mod_with('VersionCheckHelper')
diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb
index c2a5ff40852..1b0d1254dc8 100644
--- a/app/helpers/wiki_helper.rb
+++ b/app/helpers/wiki_helper.rb
@@ -136,4 +136,4 @@ module WikiHelper
   end
 end
 
-WikiHelper.prepend_if_ee('EE::WikiHelper')
+WikiHelper.prepend_mod_with('WikiHelper')