Inject EE modules in a CE compatible fashion

All instances of injecting an EE specific module have been changed to
use the new methods for this: prepend_if_ee, extend_if_ee, and
include_if_ee. This allows these lines to be included in CE, even when
the modules to inject do not exist. This in turn allows us to backport
these lines to CE and keep them there, instead of having to strip them
out.

app/controllers/admin/application_controller.rb

@@ -9,4 +9,4 @@ class Admin::ApplicationController < ApplicationController
   layout 'admin'
 end
 
-Admin::ApplicationController.prepend(EE::Admin::ApplicationController)
+Admin::ApplicationController.prepend_if_ee('EE::Admin::ApplicationController')

app/controllers/admin/application_settings_controller.rb

@@ -147,4 +147,4 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
   end
 end
 
-Admin::ApplicationSettingsController.prepend(EE::Admin::ApplicationSettingsController)
+Admin::ApplicationSettingsController.prepend_if_ee('EE::Admin::ApplicationSettingsController')

app/controllers/admin/dashboard_controller.rb

@@ -16,4 +16,4 @@ class Admin::DashboardController < Admin::ApplicationController
   # rubocop: enable CodeReuse/ActiveRecord
 end
 
-Admin::DashboardController.prepend(EE::Admin::DashboardController)
+Admin::DashboardController.prepend_if_ee('EE::Admin::DashboardController')

app/controllers/admin/groups_controller.rb

@@ -96,4 +96,4 @@ class Admin::GroupsController < Admin::ApplicationController
   end
 end
 
-Admin::GroupsController.prepend(EE::Admin::GroupsController)
+Admin::GroupsController.prepend_if_ee('EE::Admin::GroupsController')

app/controllers/admin/health_check_controller.rb

@@ -12,4 +12,4 @@ class Admin::HealthCheckController < Admin::ApplicationController
   end
 end
 
-Admin::HealthCheckController.prepend(EE::Admin::HealthCheckController)
+Admin::HealthCheckController.prepend_if_ee('EE::Admin::HealthCheckController')

app/controllers/admin/logs_controller.rb

@@ -21,4 +21,4 @@ class Admin::LogsController < Admin::ApplicationController
   end
 end
 
-Admin::LogsController.prepend(EE::Admin::LogsController)
+Admin::LogsController.prepend_if_ee('EE::Admin::LogsController')

app/controllers/admin/projects_controller.rb

@@ -77,4 +77,4 @@ class Admin::ProjectsController < Admin::ApplicationController
   end
 end
 
-Admin::ProjectsController.prepend(EE::Admin::ProjectsController)
+Admin::ProjectsController.prepend_if_ee('EE::Admin::ProjectsController')

app/controllers/admin/users_controller.rb

@@ -242,4 +242,4 @@ class Admin::UsersController < Admin::ApplicationController
   end
 end
 
-Admin::UsersController.prepend(EE::Admin::UsersController)
+Admin::UsersController.prepend_if_ee('EE::Admin::UsersController')

app/controllers/application_controller.rb

@@ -530,4 +530,4 @@ class ApplicationController < ActionController::Base
   end
 end
 
-ApplicationController.prepend(EE::ApplicationController)
+ApplicationController.prepend_if_ee('EE::ApplicationController')

app/controllers/autocomplete_controller.rb

@@ -47,4 +47,4 @@ class AutocompleteController < ApplicationController
   end
 end
 
-AutocompleteController.prepend(EE::AutocompleteController)
+AutocompleteController.prepend_if_ee('EE::AutocompleteController')

app/controllers/boards/lists_controller.rb

@@ -84,4 +84,4 @@ module Boards
   end
 end
 
-Boards::ListsController.prepend(EE::Boards::ListsController)
+Boards::ListsController.prepend_if_ee('EE::Boards::ListsController')

app/controllers/clusters/clusters_controller.rb

@@ -235,4 +235,4 @@ class Clusters::ClustersController < Clusters::BaseController
   end
 end
 
-Clusters::ClustersController.prepend(EE::Clusters::ClustersController)
+Clusters::ClustersController.prepend_if_ee('EE::Clusters::ClustersController')

app/controllers/concerns/boards_actions.rb

@@ -45,4 +45,4 @@ module BoardsActions
   end
 end
 
-BoardsActions.prepend(EE::BoardsActions)
+BoardsActions.prepend_if_ee('EE::BoardsActions')

app/controllers/concerns/boards_responses.rb

@@ -87,4 +87,4 @@ module BoardsResponses
   end
 end
 
-BoardsResponses.prepend(EE::BoardsResponses)
+BoardsResponses.prepend_if_ee('EE::BoardsResponses')

app/controllers/concerns/internal_redirect.rb

@@ -46,4 +46,4 @@ module InternalRedirect
   end
 end
 
-InternalRedirect.prepend(EE::InternalRedirect)
+InternalRedirect.prepend_if_ee('EE::InternalRedirect')

app/controllers/concerns/issuable_actions.rb

@@ -224,4 +224,4 @@ module IssuableActions
   end
 end
 
-IssuableActions.prepend(EE::IssuableActions)
+IssuableActions.prepend_if_ee('EE::IssuableActions')

app/controllers/concerns/issuable_collections.rb

@@ -215,4 +215,4 @@ module IssuableCollections
   # rubocop:enable Gitlab/ModuleWithInstanceVariables
 end
 
-IssuableCollections.prepend(EE::IssuableCollections)
+IssuableCollections.prepend_if_ee('EE::IssuableCollections')

app/controllers/concerns/lfs_request.rb

@@ -129,4 +129,4 @@ module LfsRequest
   end
 end
 
-LfsRequest.prepend(EE::LfsRequest)
+LfsRequest.prepend_if_ee('EE::LfsRequest')

app/controllers/concerns/routable_actions.rb

@@ -56,4 +56,4 @@ module RoutableActions
   end
 end
 
-RoutableActions.prepend(EE::RoutableActions)
+RoutableActions.prepend_if_ee('EE::RoutableActions')

app/controllers/concerns/service_params.rb

@@ -86,4 +86,4 @@ module ServiceParams
   end
 end
 
-ServiceParams.prepend(EE::ServiceParams)
+ServiceParams.prepend_if_ee('EE::ServiceParams')

app/controllers/confirmations_controller.rb

@@ -32,4 +32,4 @@ class ConfirmationsController < Devise::ConfirmationsController
   end
 end
 
-ConfirmationsController.prepend(EE::ConfirmationsController)
+ConfirmationsController.prepend_if_ee('EE::ConfirmationsController')

app/controllers/dashboard/projects_controller.rb

@@ -90,4 +90,4 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
   end
 end
 
-Dashboard::ProjectsController.prepend(EE::Dashboard::ProjectsController)
+Dashboard::ProjectsController.prepend_if_ee('EE::Dashboard::ProjectsController')

app/controllers/groups/application_controller.rb

@@ -39,4 +39,4 @@ class Groups::ApplicationController < ApplicationController
   end
 end
 
-Groups::ApplicationController.prepend(EE::Groups::ApplicationController)
+Groups::ApplicationController.prepend_if_ee('EE::Groups::ApplicationController')

app/controllers/groups/group_members_controller.rb

@@ -45,4 +45,4 @@ class Groups::GroupMembersController < Groups::ApplicationController
   alias_method :membershipable, :group
 end
 
-Groups::GroupMembersController.prepend(EE::Groups::GroupMembersController)
+Groups::GroupMembersController.prepend_if_ee('EE::Groups::GroupMembersController')

app/controllers/groups/milestones_controller.rb

@@ -119,4 +119,4 @@ class Groups::MilestonesController < Groups::ApplicationController
   end
 end
 
-Groups::MilestonesController.prepend(EE::Groups::MilestonesController)
+Groups::MilestonesController.prepend_if_ee('EE::Groups::MilestonesController')

app/controllers/groups_controller.rb

@@ -233,4 +233,4 @@ class GroupsController < Groups::ApplicationController
   end
 end
 
-GroupsController.prepend(EE::GroupsController)
+GroupsController.prepend_if_ee('EE::GroupsController')

app/controllers/ide_controller.rb

@@ -8,4 +8,4 @@ class IdeController < ApplicationController
   end
 end
 
-IdeController.prepend(EE::IdeController)
+IdeController.prepend_if_ee('EE::IdeController')

app/controllers/import/github_controller.rb

@@ -187,4 +187,4 @@ class Import::GithubController < Import::BaseController
   end
 end
 
-Import::GithubController.prepend(EE::Import::GithubController)
+Import::GithubController.prepend_if_ee('EE::Import::GithubController')

app/controllers/ldap/omniauth_callbacks_controller.rb

@@ -32,4 +32,4 @@ class Ldap::OmniauthCallbacksController < OmniauthCallbacksController
   end
 end
 
-Ldap::OmniauthCallbacksController.prepend(EE::Ldap::OmniauthCallbacksController)
+Ldap::OmniauthCallbacksController.prepend_if_ee('EE::Ldap::OmniauthCallbacksController')

app/controllers/omniauth_callbacks_controller.rb

@@ -215,4 +215,4 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
   end
 end
 
-OmniauthCallbacksController.prepend(EE::OmniauthCallbacksController)
+OmniauthCallbacksController.prepend_if_ee('EE::OmniauthCallbacksController')

app/controllers/passwords_controller.rb

@@ -65,4 +65,4 @@ class PasswordsController < Devise::PasswordsController
   end
 end
 
-PasswordsController.prepend(EE::PasswordsController)
+PasswordsController.prepend_if_ee('EE::PasswordsController')

app/controllers/profiles/accounts_controller.rb

@@ -31,4 +31,4 @@ class Profiles::AccountsController < Profiles::ApplicationController
   end
 end
 
-Profiles::AccountsController.prepend(EE::Profiles::AccountsController)
+Profiles::AccountsController.prepend_if_ee('EE::Profiles::AccountsController')

app/controllers/profiles/preferences_controller.rb

@@ -51,4 +51,4 @@ class Profiles::PreferencesController < Profiles::ApplicationController
   end
 end
 
-Profiles::PreferencesController.prepend(::EE::Profiles::PreferencesController)
+Profiles::PreferencesController.prepend_if_ee('::EE::Profiles::PreferencesController')

app/controllers/projects/autocomplete_sources_controller.rb

@@ -44,4 +44,4 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController
   end
 end
 
-Projects::AutocompleteSourcesController.prepend(EE::Projects::AutocompleteSourcesController)
+Projects::AutocompleteSourcesController.prepend_if_ee('EE::Projects::AutocompleteSourcesController')

app/controllers/projects/environments_controller.rb

@@ -256,4 +256,4 @@ class Projects::EnvironmentsController < Projects::ApplicationController
   end
 end
 
-Projects::EnvironmentsController.prepend(EE::Projects::EnvironmentsController)
+Projects::EnvironmentsController.prepend_if_ee('EE::Projects::EnvironmentsController')

app/controllers/projects/git_http_client_controller.rb

@@ -115,4 +115,4 @@ class Projects::GitHttpClientController < Projects::ApplicationController
   end
 end
 
-Projects::GitHttpClientController.prepend(EE::Projects::GitHttpClientController)
+Projects::GitHttpClientController.prepend_if_ee('EE::Projects::GitHttpClientController')

app/controllers/projects/git_http_controller.rb

@@ -111,4 +111,4 @@ class Projects::GitHttpController < Projects::GitHttpClientController
   end
 end
 
-Projects::GitHttpController.prepend(EE::Projects::GitHttpController)
+Projects::GitHttpController.prepend_if_ee('EE::Projects::GitHttpController')

app/controllers/projects/group_links_controller.rb

@@ -54,4 +54,4 @@ class Projects::GroupLinksController < Projects::ApplicationController
   end
 end
 
-Projects::GroupLinksController.prepend(EE::Projects::GroupLinksController)
+Projects::GroupLinksController.prepend_if_ee('EE::Projects::GroupLinksController')

app/controllers/projects/imports_controller.rb

@@ -74,4 +74,4 @@ class Projects::ImportsController < Projects::ApplicationController
   end
 end
 
-Projects::ImportsController.prepend(EE::Projects::ImportsController)
+Projects::ImportsController.prepend_if_ee('EE::Projects::ImportsController')

app/controllers/projects/issues_controller.rb

@@ -285,4 +285,4 @@ class Projects::IssuesController < Projects::ApplicationController
   end
 end
 
-Projects::IssuesController.prepend(EE::Projects::IssuesController)
+Projects::IssuesController.prepend_if_ee('EE::Projects::IssuesController')

app/controllers/projects/jobs_controller.rb

@@ -217,4 +217,4 @@ class Projects::JobsController < Projects::ApplicationController
   end
 end
 
-Projects::JobsController.prepend(EE::Projects::JobsController)
+Projects::JobsController.prepend_if_ee('EE::Projects::JobsController')

app/controllers/projects/lfs_api_controller.rb

@@ -124,4 +124,4 @@ class Projects::LfsApiController < Projects::GitHttpClientController
   end
 end
 
-Projects::LfsApiController.prepend(EE::Projects::LfsApiController)
+Projects::LfsApiController.prepend_if_ee('EE::Projects::LfsApiController')

app/controllers/projects/merge_requests/application_controller.rb

@@ -60,4 +60,4 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont
   end
 end
 
-Projects::MergeRequests::ApplicationController.prepend(EE::Projects::MergeRequests::ApplicationController)
+Projects::MergeRequests::ApplicationController.prepend_if_ee('EE::Projects::MergeRequests::ApplicationController')

app/controllers/projects/merge_requests/diffs_controller.rb

@@ -118,4 +118,4 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
   end
 end
 
-Projects::MergeRequests::DiffsController.prepend(EE::Projects::MergeRequests::DiffsController)
+Projects::MergeRequests::DiffsController.prepend_if_ee('EE::Projects::MergeRequests::DiffsController')

app/controllers/projects/merge_requests_controller.rb

@@ -338,4 +338,4 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
   end
 end
 
-Projects::MergeRequestsController.prepend(EE::Projects::MergeRequestsController)
+Projects::MergeRequestsController.prepend_if_ee('EE::Projects::MergeRequestsController')

app/controllers/projects/mirrors_controller.rb

@@ -91,4 +91,4 @@ class Projects::MirrorsController < Projects::ApplicationController
   end
 end
 
-Projects::MirrorsController.prepend(EE::Projects::MirrorsController)
+Projects::MirrorsController.prepend_if_ee('EE::Projects::MirrorsController')

app/controllers/projects/pipelines_controller.rb

@@ -198,4 +198,4 @@ class Projects::PipelinesController < Projects::ApplicationController
   end
 end
 
-Projects::PipelinesController.prepend(EE::Projects::PipelinesController)
+Projects::PipelinesController.prepend_if_ee('EE::Projects::PipelinesController')

app/controllers/projects/prometheus/metrics_controller.rb

@@ -33,4 +33,4 @@ module Projects
   end
 end
 
-Projects::Prometheus::MetricsController.prepend(EE::Projects::Prometheus::MetricsController)
+Projects::Prometheus::MetricsController.prepend_if_ee('EE::Projects::Prometheus::MetricsController')

app/controllers/projects/protected_refs_controller.rb

@@ -66,4 +66,4 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
   end
 end
 
-Projects::ProtectedRefsController.prepend(EE::Projects::ProtectedRefsController)
+Projects::ProtectedRefsController.prepend_if_ee('EE::Projects::ProtectedRefsController')

app/controllers/projects/repositories_controller.rb

@@ -87,4 +87,4 @@ class Projects::RepositoriesController < Projects::ApplicationController
   end
 end
 
-Projects::RepositoriesController.prepend(EE::Projects::RepositoriesController)
+Projects::RepositoriesController.prepend_if_ee('EE::Projects::RepositoriesController')

app/controllers/projects/settings/ci_cd_controller.rb

@@ -123,4 +123,4 @@ module Projects
   end
 end
 
-Projects::Settings::CiCdController.prepend(EE::Projects::Settings::CiCdController)
+Projects::Settings::CiCdController.prepend_if_ee('EE::Projects::Settings::CiCdController')

app/controllers/projects/settings/integrations_controller.rb

@@ -26,4 +26,4 @@ module Projects
   end
 end
 
-Projects::Settings::IntegrationsController.prepend(EE::Projects::Settings::IntegrationsController)
+Projects::Settings::IntegrationsController.prepend_if_ee('EE::Projects::Settings::IntegrationsController')

app/controllers/projects/settings/operations_controller.rb

@@ -70,4 +70,4 @@ module Projects
   end
 end
 
-Projects::Settings::OperationsController.prepend(::EE::Projects::Settings::OperationsController)
+Projects::Settings::OperationsController.prepend_if_ee('::EE::Projects::Settings::OperationsController')

app/controllers/projects/settings/repository_controller.rb

@@ -105,4 +105,4 @@ module Projects
   end
 end
 
-Projects::Settings::RepositoryController.prepend(EE::Projects::Settings::RepositoryController)
+Projects::Settings::RepositoryController.prepend_if_ee('EE::Projects::Settings::RepositoryController')

app/controllers/projects/variables_controller.rb

@@ -42,4 +42,4 @@ class Projects::VariablesController < Projects::ApplicationController
   end
 end
 
-Projects::VariablesController.prepend(EE::Projects::VariablesController)
+Projects::VariablesController.prepend_if_ee('EE::Projects::VariablesController')

app/controllers/projects_controller.rb

@@ -467,4 +467,4 @@ class ProjectsController < Projects::ApplicationController
   end
 end
 
-ProjectsController.prepend(EE::ProjectsController)
+ProjectsController.prepend_if_ee('EE::ProjectsController')

app/controllers/registrations_controller.rb

@@ -136,4 +136,4 @@ class RegistrationsController < Devise::RegistrationsController
   end
 end
 
-RegistrationsController.prepend(EE::RegistrationsController)
+RegistrationsController.prepend_if_ee('EE::RegistrationsController')

app/controllers/root_controller.rb

@@ -63,4 +63,4 @@ class RootController < Dashboard::ProjectsController
   end
 end
 
-RootController.prepend(EE::RootController)
+RootController.prepend_if_ee('EE::RootController')

app/controllers/sent_notifications_controller.rb

@@ -37,4 +37,4 @@ class SentNotificationsController < ApplicationController
   end
 end
 
-SentNotificationsController.prepend(EE::SentNotificationsController)
+SentNotificationsController.prepend_if_ee('EE::SentNotificationsController')

app/controllers/sessions_controller.rb

@@ -251,4 +251,4 @@ class SessionsController < Devise::SessionsController
   end
 end
 
-SessionsController.prepend(EE::SessionsController)
+SessionsController.prepend_if_ee('EE::SessionsController')

app/controllers/users_controller.rb

@@ -168,4 +168,4 @@ class UsersController < ApplicationController
   end
 end
 
-UsersController.prepend(EE::UsersController)
+UsersController.prepend_if_ee('EE::UsersController')

app/finders/autocomplete/users_finder.rb

@@ -94,4 +94,4 @@ module Autocomplete
   end
 end
 
-Autocomplete::UsersFinder.prepend(EE::Autocomplete::UsersFinder)
+Autocomplete::UsersFinder.prepend_if_ee('EE::Autocomplete::UsersFinder')

app/finders/group_members_finder.rb

@@ -35,4 +35,4 @@ class GroupMembersFinder < UnionFinder
   # rubocop: enable CodeReuse/ActiveRecord
 end
 
-GroupMembersFinder.prepend(EE::GroupMembersFinder)
+GroupMembersFinder.prepend_if_ee('EE::GroupMembersFinder')

app/finders/issues_finder.rb

@@ -146,4 +146,4 @@ class IssuesFinder < IssuableFinder
   end
 end
 
-IssuesFinder.prepend(EE::IssuesFinder)
+IssuesFinder.prepend_if_ee('EE::IssuesFinder')

app/finders/merge_requests_finder.rb

@@ -102,4 +102,4 @@ class MergeRequestsFinder < IssuableFinder
   end
 end
 
-MergeRequestsFinder.prepend(EE::MergeRequestsFinder)
+MergeRequestsFinder.prepend_if_ee('EE::MergeRequestsFinder')

app/finders/notes_finder.rb

@@ -154,4 +154,4 @@ class NotesFinder
   end
 end
 
-NotesFinder.prepend(EE::NotesFinder)
+NotesFinder.prepend_if_ee('EE::NotesFinder')

app/finders/users_finder.rb

@@ -96,4 +96,4 @@ class UsersFinder
   end
 end
 
-UsersFinder.prepend(EE::UsersFinder)
+UsersFinder.prepend_if_ee('EE::UsersFinder')

app/graphql/types/group_type.rb

@@ -20,4 +20,4 @@ module Types
   end
 end
 
-Types::GroupType.prepend(EE::Types::GroupType)
+Types::GroupType.prepend_if_ee('EE::Types::GroupType')

app/graphql/types/issue_type.rb

@@ -58,4 +58,4 @@ module Types
   end
 end
 
-Types::IssueType.prepend(::EE::Types::IssueType)
+Types::IssueType.prepend_if_ee('::EE::Types::IssueType')

app/graphql/types/mutation_type.rb

@@ -18,4 +18,4 @@ module Types
   end
 end
 
-::Types::MutationType.prepend(::EE::Types::MutationType)
+::Types::MutationType.prepend_if_ee('::EE::Types::MutationType')

app/graphql/types/notes/noteable_type.rb

@@ -24,4 +24,4 @@ module Types
   end
 end
 
-Types::Notes::NoteableType.extend(::EE::Types::Notes::NoteableType)
+Types::Notes::NoteableType.extend_if_ee('::EE::Types::Notes::NoteableType')

app/graphql/types/permission_types/issue.rb

@@ -13,4 +13,4 @@ module Types
   end
 end
 
-Types::PermissionTypes::Issue.prepend(::EE::Types::PermissionTypes::Issue)
+Types::PermissionTypes::Issue.prepend_if_ee('::EE::Types::PermissionTypes::Issue')

app/graphql/types/permission_types/project.rb

@@ -21,4 +21,4 @@ module Types
   end
 end
 
-Types::PermissionTypes::Project.prepend(EE::Types::PermissionTypes::Project)
+Types::PermissionTypes::Project.prepend_if_ee('EE::Types::PermissionTypes::Project')

app/helpers/appearances_helper.rb

@@ -79,4 +79,4 @@ module AppearancesHelper
   end
 end
 
-AppearancesHelper.prepend(EE::AppearancesHelper)
+AppearancesHelper.prepend_if_ee('EE::AppearancesHelper')

app/helpers/application_helper.rb

@@ -307,4 +307,4 @@ module ApplicationHelper
   end
 end
 
-ApplicationHelper.prepend(EE::ApplicationHelper)
+ApplicationHelper.prepend_if_ee('EE::ApplicationHelper')

app/helpers/application_settings_helper.rb

@@ -293,8 +293,8 @@ module ApplicationSettingsHelper
   end
 end
 
-ApplicationSettingsHelper.prepend(EE::ApplicationSettingsHelper) # rubocop: disable Cop/InjectEnterpriseEditionModule
+ApplicationSettingsHelper.prepend_if_ee('EE::ApplicationSettingsHelper') # rubocop: disable Cop/InjectEnterpriseEditionModule
 
 # The methods in `EE::ApplicationSettingsHelper` should be available as both
 # instance and class methods.
-ApplicationSettingsHelper.extend(EE::ApplicationSettingsHelper)
+ApplicationSettingsHelper.extend_if_ee('EE::ApplicationSettingsHelper')

app/helpers/auth_helper.rb

@@ -111,8 +111,8 @@ module AuthHelper
   extend self
 end
 
-AuthHelper.prepend(EE::AuthHelper) # rubocop: disable Cop/InjectEnterpriseEditionModule
+AuthHelper.prepend_if_ee('EE::AuthHelper') # rubocop: disable Cop/InjectEnterpriseEditionModule
 
 # The methods added in EE should be available as both class and instance
 # methods, just like the methods provided by `AuthHelper` itself.
-AuthHelper.extend(EE::AuthHelper)
+AuthHelper.extend_if_ee('EE::AuthHelper')

app/helpers/award_emoji_helper.rb

@@ -17,4 +17,4 @@ module AwardEmojiHelper
   end
 end
 
-AwardEmojiHelper.prepend(EE::AwardEmojiHelper)
+AwardEmojiHelper.prepend_if_ee('EE::AwardEmojiHelper')

app/helpers/boards_helper.rb

@@ -108,4 +108,4 @@ module BoardsHelper
   end
 end
 
-BoardsHelper.prepend(EE::BoardsHelper)
+BoardsHelper.prepend_if_ee('EE::BoardsHelper')

app/helpers/branches_helper.rb

@@ -10,4 +10,4 @@ module BranchesHelper
   end
 end
 
-BranchesHelper.prepend(EE::BranchesHelper)
+BranchesHelper.prepend_if_ee('EE::BranchesHelper')

app/helpers/button_helper.rb

@@ -98,4 +98,4 @@ module ButtonHelper
   end
 end
 
-ButtonHelper.prepend(EE::ButtonHelper)
+ButtonHelper.prepend_if_ee('EE::ButtonHelper')

app/helpers/clusters_helper.rb

@@ -22,4 +22,4 @@ module ClustersHelper
   end
 end
 
-ClustersHelper.prepend(EE::ClustersHelper)
+ClustersHelper.prepend_if_ee('EE::ClustersHelper')

app/helpers/dashboard_helper.rb

@@ -53,4 +53,4 @@ module DashboardHelper
   end
 end
 
-DashboardHelper.prepend(EE::DashboardHelper)
+DashboardHelper.prepend_if_ee('EE::DashboardHelper')

app/helpers/emails_helper.rb

@@ -188,4 +188,4 @@ module EmailsHelper
   end
 end
 
-EmailsHelper.prepend(EE::EmailsHelper)
+EmailsHelper.prepend_if_ee('EE::EmailsHelper')

app/helpers/gitlab_routing_helper.rb

@@ -195,4 +195,4 @@ module GitlabRoutingHelper
   end
 end
 
-GitlabRoutingHelper.include(EE::GitlabRoutingHelper)
+GitlabRoutingHelper.include_if_ee('EE::GitlabRoutingHelper')

app/helpers/groups/group_members_helper.rb

@@ -6,4 +6,4 @@ module Groups::GroupMembersHelper
   end
 end
 
-Groups::GroupMembersHelper.prepend(EE::Groups::GroupMembersHelper)
+Groups::GroupMembersHelper.prepend_if_ee('EE::Groups::GroupMembersHelper')

app/helpers/groups_helper.rb

@@ -198,4 +198,4 @@ module GroupsHelper
   end
 end
 
-GroupsHelper.prepend(EE::GroupsHelper)
+GroupsHelper.prepend_if_ee('EE::GroupsHelper')

app/helpers/issuables_helper.rb

@@ -444,4 +444,4 @@ module IssuablesHelper
   end
 end
 
-IssuablesHelper.prepend(EE::IssuablesHelper)
+IssuablesHelper.prepend_if_ee('EE::IssuablesHelper')

app/helpers/issues_helper.rb

@@ -156,4 +156,4 @@ module IssuesHelper
   module_function :url_for_tracker_issue
 end
 
-IssuesHelper.include(EE::IssuesHelper)
+IssuesHelper.include_if_ee('EE::IssuesHelper')

app/helpers/kerberos_spnego_helper.rb

@@ -10,4 +10,4 @@ module KerberosSpnegoHelper
   end
 end
 
-KerberosSpnegoHelper.prepend(EE::KerberosSpnegoHelper)
+KerberosSpnegoHelper.prepend_if_ee('EE::KerberosSpnegoHelper')

app/helpers/labels_helper.rb

@@ -252,4 +252,4 @@ module LabelsHelper
   module_function :render_colored_label, :text_color_for_bg, :escape_once, :label_tooltip_title
 end
 
-LabelsHelper.prepend(EE::LabelsHelper)
+LabelsHelper.prepend_if_ee('EE::LabelsHelper')

app/helpers/merge_requests_helper.rb

@@ -160,4 +160,4 @@ module MergeRequestsHelper
   end
 end
 
-MergeRequestsHelper.prepend(EE::MergeRequestsHelper)
+MergeRequestsHelper.prepend_if_ee('EE::MergeRequestsHelper')

app/helpers/milestones_helper.rb

@@ -260,4 +260,4 @@ module MilestonesHelper
   end
 end
 
-MilestonesHelper.prepend(EE::MilestonesHelper)
+MilestonesHelper.prepend_if_ee('EE::MilestonesHelper')

app/helpers/mirror_helper.rb

@@ -13,4 +13,4 @@ module MirrorHelper
   end
 end
 
-MirrorHelper.prepend(EE::MirrorHelper)
+MirrorHelper.prepend_if_ee('EE::MirrorHelper')

app/helpers/namespaces_helper.rb

@@ -89,4 +89,4 @@ module NamespacesHelper
   end
 end
 
-NamespacesHelper.include(EE::NamespacesHelper)
+NamespacesHelper.include_if_ee('EE::NamespacesHelper')

app/helpers/nav_helper.rb

@@ -91,4 +91,4 @@ module NavHelper
   end
 end
 
-NavHelper.prepend(EE::NavHelper)
+NavHelper.prepend_if_ee('EE::NavHelper')

app/helpers/notes_helper.rb

@@ -187,4 +187,4 @@ module NotesHelper
   end
 end
 
-NotesHelper.prepend(EE::NotesHelper)
+NotesHelper.prepend_if_ee('EE::NotesHelper')

app/helpers/onboarding_experiment_helper.rb

@@ -6,4 +6,4 @@ module OnboardingExperimentHelper
   end
 end
 
-OnboardingExperimentHelper.prepend(EE::OnboardingExperimentHelper)
+OnboardingExperimentHelper.prepend_if_ee('EE::OnboardingExperimentHelper')

app/helpers/preferences_helper.rb

@@ -88,4 +88,4 @@ module PreferencesHelper
   end
 end
 
-PreferencesHelper.prepend(EE::PreferencesHelper)
+PreferencesHelper.prepend_if_ee('EE::PreferencesHelper')

app/helpers/recaptcha_experiment_helper.rb

@@ -6,4 +6,4 @@ module RecaptchaExperimentHelper
   end
 end
 
-RecaptchaExperimentHelper.prepend(EE::RecaptchaExperimentHelper)
+RecaptchaExperimentHelper.prepend_if_ee('EE::RecaptchaExperimentHelper')