Commit c2f3d27c authored by Robert Speicher's avatar Robert Speicher

Merge branch 'ee-prepend-ee-helper' into 'master'

EE: Add methods for injecting EE modules

See merge request gitlab-org/gitlab-ee!14863
parents 2b8b6b0f 8ccd8070
...@@ -9,4 +9,4 @@ class Admin::ApplicationController < ApplicationController ...@@ -9,4 +9,4 @@ class Admin::ApplicationController < ApplicationController
layout 'admin' layout 'admin'
end end
Admin::ApplicationController.prepend(EE::Admin::ApplicationController) Admin::ApplicationController.prepend_if_ee('EE::Admin::ApplicationController')
...@@ -147,4 +147,4 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController ...@@ -147,4 +147,4 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
end end
end end
Admin::ApplicationSettingsController.prepend(EE::Admin::ApplicationSettingsController) Admin::ApplicationSettingsController.prepend_if_ee('EE::Admin::ApplicationSettingsController')
...@@ -16,4 +16,4 @@ class Admin::DashboardController < Admin::ApplicationController ...@@ -16,4 +16,4 @@ class Admin::DashboardController < Admin::ApplicationController
# rubocop: enable CodeReuse/ActiveRecord # rubocop: enable CodeReuse/ActiveRecord
end end
Admin::DashboardController.prepend(EE::Admin::DashboardController) Admin::DashboardController.prepend_if_ee('EE::Admin::DashboardController')
...@@ -96,4 +96,4 @@ class Admin::GroupsController < Admin::ApplicationController ...@@ -96,4 +96,4 @@ class Admin::GroupsController < Admin::ApplicationController
end end
end end
Admin::GroupsController.prepend(EE::Admin::GroupsController) Admin::GroupsController.prepend_if_ee('EE::Admin::GroupsController')
...@@ -12,4 +12,4 @@ class Admin::HealthCheckController < Admin::ApplicationController ...@@ -12,4 +12,4 @@ class Admin::HealthCheckController < Admin::ApplicationController
end end
end end
Admin::HealthCheckController.prepend(EE::Admin::HealthCheckController) Admin::HealthCheckController.prepend_if_ee('EE::Admin::HealthCheckController')
...@@ -21,4 +21,4 @@ class Admin::LogsController < Admin::ApplicationController ...@@ -21,4 +21,4 @@ class Admin::LogsController < Admin::ApplicationController
end end
end end
Admin::LogsController.prepend(EE::Admin::LogsController) Admin::LogsController.prepend_if_ee('EE::Admin::LogsController')
...@@ -77,4 +77,4 @@ class Admin::ProjectsController < Admin::ApplicationController ...@@ -77,4 +77,4 @@ class Admin::ProjectsController < Admin::ApplicationController
end end
end end
Admin::ProjectsController.prepend(EE::Admin::ProjectsController) Admin::ProjectsController.prepend_if_ee('EE::Admin::ProjectsController')
...@@ -242,4 +242,4 @@ class Admin::UsersController < Admin::ApplicationController ...@@ -242,4 +242,4 @@ class Admin::UsersController < Admin::ApplicationController
end end
end end
Admin::UsersController.prepend(EE::Admin::UsersController) Admin::UsersController.prepend_if_ee('EE::Admin::UsersController')
...@@ -530,4 +530,4 @@ class ApplicationController < ActionController::Base ...@@ -530,4 +530,4 @@ class ApplicationController < ActionController::Base
end end
end end
ApplicationController.prepend(EE::ApplicationController) ApplicationController.prepend_if_ee('EE::ApplicationController')
...@@ -47,4 +47,4 @@ class AutocompleteController < ApplicationController ...@@ -47,4 +47,4 @@ class AutocompleteController < ApplicationController
end end
end end
AutocompleteController.prepend(EE::AutocompleteController) AutocompleteController.prepend_if_ee('EE::AutocompleteController')
...@@ -84,4 +84,4 @@ module Boards ...@@ -84,4 +84,4 @@ module Boards
end end
end end
Boards::ListsController.prepend(EE::Boards::ListsController) Boards::ListsController.prepend_if_ee('EE::Boards::ListsController')
...@@ -235,4 +235,4 @@ class Clusters::ClustersController < Clusters::BaseController ...@@ -235,4 +235,4 @@ class Clusters::ClustersController < Clusters::BaseController
end end
end end
Clusters::ClustersController.prepend(EE::Clusters::ClustersController) Clusters::ClustersController.prepend_if_ee('EE::Clusters::ClustersController')
...@@ -45,4 +45,4 @@ module BoardsActions ...@@ -45,4 +45,4 @@ module BoardsActions
end end
end end
BoardsActions.prepend(EE::BoardsActions) BoardsActions.prepend_if_ee('EE::BoardsActions')
...@@ -87,4 +87,4 @@ module BoardsResponses ...@@ -87,4 +87,4 @@ module BoardsResponses
end end
end end
BoardsResponses.prepend(EE::BoardsResponses) BoardsResponses.prepend_if_ee('EE::BoardsResponses')
...@@ -46,4 +46,4 @@ module InternalRedirect ...@@ -46,4 +46,4 @@ module InternalRedirect
end end
end end
InternalRedirect.prepend(EE::InternalRedirect) InternalRedirect.prepend_if_ee('EE::InternalRedirect')
...@@ -224,4 +224,4 @@ module IssuableActions ...@@ -224,4 +224,4 @@ module IssuableActions
end end
end end
IssuableActions.prepend(EE::IssuableActions) IssuableActions.prepend_if_ee('EE::IssuableActions')
...@@ -215,4 +215,4 @@ module IssuableCollections ...@@ -215,4 +215,4 @@ module IssuableCollections
# rubocop:enable Gitlab/ModuleWithInstanceVariables # rubocop:enable Gitlab/ModuleWithInstanceVariables
end end
IssuableCollections.prepend(EE::IssuableCollections) IssuableCollections.prepend_if_ee('EE::IssuableCollections')
...@@ -129,4 +129,4 @@ module LfsRequest ...@@ -129,4 +129,4 @@ module LfsRequest
end end
end end
LfsRequest.prepend(EE::LfsRequest) LfsRequest.prepend_if_ee('EE::LfsRequest')
...@@ -56,4 +56,4 @@ module RoutableActions ...@@ -56,4 +56,4 @@ module RoutableActions
end end
end end
RoutableActions.prepend(EE::RoutableActions) RoutableActions.prepend_if_ee('EE::RoutableActions')
...@@ -86,4 +86,4 @@ module ServiceParams ...@@ -86,4 +86,4 @@ module ServiceParams
end end
end end
ServiceParams.prepend(EE::ServiceParams) ServiceParams.prepend_if_ee('EE::ServiceParams')
...@@ -32,4 +32,4 @@ class ConfirmationsController < Devise::ConfirmationsController ...@@ -32,4 +32,4 @@ class ConfirmationsController < Devise::ConfirmationsController
end end
end end
ConfirmationsController.prepend(EE::ConfirmationsController) ConfirmationsController.prepend_if_ee('EE::ConfirmationsController')
...@@ -90,4 +90,4 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController ...@@ -90,4 +90,4 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
end end
end end
Dashboard::ProjectsController.prepend(EE::Dashboard::ProjectsController) Dashboard::ProjectsController.prepend_if_ee('EE::Dashboard::ProjectsController')
...@@ -39,4 +39,4 @@ class Groups::ApplicationController < ApplicationController ...@@ -39,4 +39,4 @@ class Groups::ApplicationController < ApplicationController
end end
end end
Groups::ApplicationController.prepend(EE::Groups::ApplicationController) Groups::ApplicationController.prepend_if_ee('EE::Groups::ApplicationController')
...@@ -45,4 +45,4 @@ class Groups::GroupMembersController < Groups::ApplicationController ...@@ -45,4 +45,4 @@ class Groups::GroupMembersController < Groups::ApplicationController
alias_method :membershipable, :group alias_method :membershipable, :group
end end
Groups::GroupMembersController.prepend(EE::Groups::GroupMembersController) Groups::GroupMembersController.prepend_if_ee('EE::Groups::GroupMembersController')
...@@ -119,4 +119,4 @@ class Groups::MilestonesController < Groups::ApplicationController ...@@ -119,4 +119,4 @@ class Groups::MilestonesController < Groups::ApplicationController
end end
end end
Groups::MilestonesController.prepend(EE::Groups::MilestonesController) Groups::MilestonesController.prepend_if_ee('EE::Groups::MilestonesController')
...@@ -233,4 +233,4 @@ class GroupsController < Groups::ApplicationController ...@@ -233,4 +233,4 @@ class GroupsController < Groups::ApplicationController
end end
end end
GroupsController.prepend(EE::GroupsController) GroupsController.prepend_if_ee('EE::GroupsController')
...@@ -8,4 +8,4 @@ class IdeController < ApplicationController ...@@ -8,4 +8,4 @@ class IdeController < ApplicationController
end end
end end
IdeController.prepend(EE::IdeController) IdeController.prepend_if_ee('EE::IdeController')
...@@ -187,4 +187,4 @@ class Import::GithubController < Import::BaseController ...@@ -187,4 +187,4 @@ class Import::GithubController < Import::BaseController
end end
end end
Import::GithubController.prepend(EE::Import::GithubController) Import::GithubController.prepend_if_ee('EE::Import::GithubController')
...@@ -32,4 +32,4 @@ class Ldap::OmniauthCallbacksController < OmniauthCallbacksController ...@@ -32,4 +32,4 @@ class Ldap::OmniauthCallbacksController < OmniauthCallbacksController
end end
end end
Ldap::OmniauthCallbacksController.prepend(EE::Ldap::OmniauthCallbacksController) Ldap::OmniauthCallbacksController.prepend_if_ee('EE::Ldap::OmniauthCallbacksController')
...@@ -215,4 +215,4 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController ...@@ -215,4 +215,4 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
end end
end end
OmniauthCallbacksController.prepend(EE::OmniauthCallbacksController) OmniauthCallbacksController.prepend_if_ee('EE::OmniauthCallbacksController')
...@@ -65,4 +65,4 @@ class PasswordsController < Devise::PasswordsController ...@@ -65,4 +65,4 @@ class PasswordsController < Devise::PasswordsController
end end
end end
PasswordsController.prepend(EE::PasswordsController) PasswordsController.prepend_if_ee('EE::PasswordsController')
...@@ -31,4 +31,4 @@ class Profiles::AccountsController < Profiles::ApplicationController ...@@ -31,4 +31,4 @@ class Profiles::AccountsController < Profiles::ApplicationController
end end
end end
Profiles::AccountsController.prepend(EE::Profiles::AccountsController) Profiles::AccountsController.prepend_if_ee('EE::Profiles::AccountsController')
...@@ -51,4 +51,4 @@ class Profiles::PreferencesController < Profiles::ApplicationController ...@@ -51,4 +51,4 @@ class Profiles::PreferencesController < Profiles::ApplicationController
end end
end end
Profiles::PreferencesController.prepend(::EE::Profiles::PreferencesController) Profiles::PreferencesController.prepend_if_ee('::EE::Profiles::PreferencesController')
...@@ -44,4 +44,4 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController ...@@ -44,4 +44,4 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController
end end
end end
Projects::AutocompleteSourcesController.prepend(EE::Projects::AutocompleteSourcesController) Projects::AutocompleteSourcesController.prepend_if_ee('EE::Projects::AutocompleteSourcesController')
...@@ -256,4 +256,4 @@ class Projects::EnvironmentsController < Projects::ApplicationController ...@@ -256,4 +256,4 @@ class Projects::EnvironmentsController < Projects::ApplicationController
end end
end end
Projects::EnvironmentsController.prepend(EE::Projects::EnvironmentsController) Projects::EnvironmentsController.prepend_if_ee('EE::Projects::EnvironmentsController')
...@@ -115,4 +115,4 @@ class Projects::GitHttpClientController < Projects::ApplicationController ...@@ -115,4 +115,4 @@ class Projects::GitHttpClientController < Projects::ApplicationController
end end
end end
Projects::GitHttpClientController.prepend(EE::Projects::GitHttpClientController) Projects::GitHttpClientController.prepend_if_ee('EE::Projects::GitHttpClientController')
...@@ -111,4 +111,4 @@ class Projects::GitHttpController < Projects::GitHttpClientController ...@@ -111,4 +111,4 @@ class Projects::GitHttpController < Projects::GitHttpClientController
end end
end end
Projects::GitHttpController.prepend(EE::Projects::GitHttpController) Projects::GitHttpController.prepend_if_ee('EE::Projects::GitHttpController')
...@@ -54,4 +54,4 @@ class Projects::GroupLinksController < Projects::ApplicationController ...@@ -54,4 +54,4 @@ class Projects::GroupLinksController < Projects::ApplicationController
end end
end end
Projects::GroupLinksController.prepend(EE::Projects::GroupLinksController) Projects::GroupLinksController.prepend_if_ee('EE::Projects::GroupLinksController')
...@@ -74,4 +74,4 @@ class Projects::ImportsController < Projects::ApplicationController ...@@ -74,4 +74,4 @@ class Projects::ImportsController < Projects::ApplicationController
end end
end end
Projects::ImportsController.prepend(EE::Projects::ImportsController) Projects::ImportsController.prepend_if_ee('EE::Projects::ImportsController')
...@@ -285,4 +285,4 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -285,4 +285,4 @@ class Projects::IssuesController < Projects::ApplicationController
end end
end end
Projects::IssuesController.prepend(EE::Projects::IssuesController) Projects::IssuesController.prepend_if_ee('EE::Projects::IssuesController')
...@@ -217,4 +217,4 @@ class Projects::JobsController < Projects::ApplicationController ...@@ -217,4 +217,4 @@ class Projects::JobsController < Projects::ApplicationController
end end
end end
Projects::JobsController.prepend(EE::Projects::JobsController) Projects::JobsController.prepend_if_ee('EE::Projects::JobsController')
...@@ -124,4 +124,4 @@ class Projects::LfsApiController < Projects::GitHttpClientController ...@@ -124,4 +124,4 @@ class Projects::LfsApiController < Projects::GitHttpClientController
end end
end end
Projects::LfsApiController.prepend(EE::Projects::LfsApiController) Projects::LfsApiController.prepend_if_ee('EE::Projects::LfsApiController')
...@@ -60,4 +60,4 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont ...@@ -60,4 +60,4 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont
end end
end end
Projects::MergeRequests::ApplicationController.prepend(EE::Projects::MergeRequests::ApplicationController) Projects::MergeRequests::ApplicationController.prepend_if_ee('EE::Projects::MergeRequests::ApplicationController')
...@@ -118,4 +118,4 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic ...@@ -118,4 +118,4 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
end end
end end
Projects::MergeRequests::DiffsController.prepend(EE::Projects::MergeRequests::DiffsController) Projects::MergeRequests::DiffsController.prepend_if_ee('EE::Projects::MergeRequests::DiffsController')
...@@ -338,4 +338,4 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo ...@@ -338,4 +338,4 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
end end
end end
Projects::MergeRequestsController.prepend(EE::Projects::MergeRequestsController) Projects::MergeRequestsController.prepend_if_ee('EE::Projects::MergeRequestsController')
...@@ -91,4 +91,4 @@ class Projects::MirrorsController < Projects::ApplicationController ...@@ -91,4 +91,4 @@ class Projects::MirrorsController < Projects::ApplicationController
end end
end end
Projects::MirrorsController.prepend(EE::Projects::MirrorsController) Projects::MirrorsController.prepend_if_ee('EE::Projects::MirrorsController')
...@@ -198,4 +198,4 @@ class Projects::PipelinesController < Projects::ApplicationController ...@@ -198,4 +198,4 @@ class Projects::PipelinesController < Projects::ApplicationController
end end
end end
Projects::PipelinesController.prepend(EE::Projects::PipelinesController) Projects::PipelinesController.prepend_if_ee('EE::Projects::PipelinesController')
...@@ -33,4 +33,4 @@ module Projects ...@@ -33,4 +33,4 @@ module Projects
end end
end end
Projects::Prometheus::MetricsController.prepend(EE::Projects::Prometheus::MetricsController) Projects::Prometheus::MetricsController.prepend_if_ee('EE::Projects::Prometheus::MetricsController')
...@@ -66,4 +66,4 @@ class Projects::ProtectedRefsController < Projects::ApplicationController ...@@ -66,4 +66,4 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
end end
end end
Projects::ProtectedRefsController.prepend(EE::Projects::ProtectedRefsController) Projects::ProtectedRefsController.prepend_if_ee('EE::Projects::ProtectedRefsController')
...@@ -87,4 +87,4 @@ class Projects::RepositoriesController < Projects::ApplicationController ...@@ -87,4 +87,4 @@ class Projects::RepositoriesController < Projects::ApplicationController
end end
end end
Projects::RepositoriesController.prepend(EE::Projects::RepositoriesController) Projects::RepositoriesController.prepend_if_ee('EE::Projects::RepositoriesController')
...@@ -123,4 +123,4 @@ module Projects ...@@ -123,4 +123,4 @@ module Projects
end end
end end
Projects::Settings::CiCdController.prepend(EE::Projects::Settings::CiCdController) Projects::Settings::CiCdController.prepend_if_ee('EE::Projects::Settings::CiCdController')
...@@ -26,4 +26,4 @@ module Projects ...@@ -26,4 +26,4 @@ module Projects
end end
end end
Projects::Settings::IntegrationsController.prepend(EE::Projects::Settings::IntegrationsController) Projects::Settings::IntegrationsController.prepend_if_ee('EE::Projects::Settings::IntegrationsController')
...@@ -70,4 +70,4 @@ module Projects ...@@ -70,4 +70,4 @@ module Projects
end end
end end
Projects::Settings::OperationsController.prepend(::EE::Projects::Settings::OperationsController) Projects::Settings::OperationsController.prepend_if_ee('::EE::Projects::Settings::OperationsController')
...@@ -105,4 +105,4 @@ module Projects ...@@ -105,4 +105,4 @@ module Projects
end end
end end
Projects::Settings::RepositoryController.prepend(EE::Projects::Settings::RepositoryController) Projects::Settings::RepositoryController.prepend_if_ee('EE::Projects::Settings::RepositoryController')
...@@ -42,4 +42,4 @@ class Projects::VariablesController < Projects::ApplicationController ...@@ -42,4 +42,4 @@ class Projects::VariablesController < Projects::ApplicationController
end end
end end
Projects::VariablesController.prepend(EE::Projects::VariablesController) Projects::VariablesController.prepend_if_ee('EE::Projects::VariablesController')
...@@ -467,4 +467,4 @@ class ProjectsController < Projects::ApplicationController ...@@ -467,4 +467,4 @@ class ProjectsController < Projects::ApplicationController
end end
end end
ProjectsController.prepend(EE::ProjectsController) ProjectsController.prepend_if_ee('EE::ProjectsController')
...@@ -136,4 +136,4 @@ class RegistrationsController < Devise::RegistrationsController ...@@ -136,4 +136,4 @@ class RegistrationsController < Devise::RegistrationsController
end end
end end
RegistrationsController.prepend(EE::RegistrationsController) RegistrationsController.prepend_if_ee('EE::RegistrationsController')
...@@ -63,4 +63,4 @@ class RootController < Dashboard::ProjectsController ...@@ -63,4 +63,4 @@ class RootController < Dashboard::ProjectsController
end end
end end
RootController.prepend(EE::RootController) RootController.prepend_if_ee('EE::RootController')
...@@ -37,4 +37,4 @@ class SentNotificationsController < ApplicationController ...@@ -37,4 +37,4 @@ class SentNotificationsController < ApplicationController
end end
end end
SentNotificationsController.prepend(EE::SentNotificationsController) SentNotificationsController.prepend_if_ee('EE::SentNotificationsController')
...@@ -251,4 +251,4 @@ class SessionsController < Devise::SessionsController ...@@ -251,4 +251,4 @@ class SessionsController < Devise::SessionsController
end end
end end
SessionsController.prepend(EE::SessionsController) SessionsController.prepend_if_ee('EE::SessionsController')
...@@ -168,4 +168,4 @@ class UsersController < ApplicationController ...@@ -168,4 +168,4 @@ class UsersController < ApplicationController
end end
end end
UsersController.prepend(EE::UsersController) UsersController.prepend_if_ee('EE::UsersController')
...@@ -94,4 +94,4 @@ module Autocomplete ...@@ -94,4 +94,4 @@ module Autocomplete
end end
end end
Autocomplete::UsersFinder.prepend(EE::Autocomplete::UsersFinder) Autocomplete::UsersFinder.prepend_if_ee('EE::Autocomplete::UsersFinder')
...@@ -35,4 +35,4 @@ class GroupMembersFinder < UnionFinder ...@@ -35,4 +35,4 @@ class GroupMembersFinder < UnionFinder
# rubocop: enable CodeReuse/ActiveRecord # rubocop: enable CodeReuse/ActiveRecord
end end
GroupMembersFinder.prepend(EE::GroupMembersFinder) GroupMembersFinder.prepend_if_ee('EE::GroupMembersFinder')
...@@ -146,4 +146,4 @@ class IssuesFinder < IssuableFinder ...@@ -146,4 +146,4 @@ class IssuesFinder < IssuableFinder
end end
end end
IssuesFinder.prepend(EE::IssuesFinder) IssuesFinder.prepend_if_ee('EE::IssuesFinder')
...@@ -102,4 +102,4 @@ class MergeRequestsFinder < IssuableFinder ...@@ -102,4 +102,4 @@ class MergeRequestsFinder < IssuableFinder
end end
end end
MergeRequestsFinder.prepend(EE::MergeRequestsFinder) MergeRequestsFinder.prepend_if_ee('EE::MergeRequestsFinder')
...@@ -154,4 +154,4 @@ class NotesFinder ...@@ -154,4 +154,4 @@ class NotesFinder
end end
end end
NotesFinder.prepend(EE::NotesFinder) NotesFinder.prepend_if_ee('EE::NotesFinder')
...@@ -96,4 +96,4 @@ class UsersFinder ...@@ -96,4 +96,4 @@ class UsersFinder
end end
end end
UsersFinder.prepend(EE::UsersFinder) UsersFinder.prepend_if_ee('EE::UsersFinder')
...@@ -20,4 +20,4 @@ module Types ...@@ -20,4 +20,4 @@ module Types
end end
end end
Types::GroupType.prepend(EE::Types::GroupType) Types::GroupType.prepend_if_ee('EE::Types::GroupType')
...@@ -58,4 +58,4 @@ module Types ...@@ -58,4 +58,4 @@ module Types
end end
end end
Types::IssueType.prepend(::EE::Types::IssueType) Types::IssueType.prepend_if_ee('::EE::Types::IssueType')
...@@ -18,4 +18,4 @@ module Types ...@@ -18,4 +18,4 @@ module Types
end end
end end
::Types::MutationType.prepend(::EE::Types::MutationType) ::Types::MutationType.prepend_if_ee('::EE::Types::MutationType')
...@@ -24,4 +24,4 @@ module Types ...@@ -24,4 +24,4 @@ module Types
end end
end end
Types::Notes::NoteableType.extend(::EE::Types::Notes::NoteableType) Types::Notes::NoteableType.extend_if_ee('::EE::Types::Notes::NoteableType')
...@@ -13,4 +13,4 @@ module Types ...@@ -13,4 +13,4 @@ module Types
end end
end end
Types::PermissionTypes::Issue.prepend(::EE::Types::PermissionTypes::Issue) Types::PermissionTypes::Issue.prepend_if_ee('::EE::Types::PermissionTypes::Issue')
...@@ -21,4 +21,4 @@ module Types ...@@ -21,4 +21,4 @@ module Types
end end
end end
Types::PermissionTypes::Project.prepend(EE::Types::PermissionTypes::Project) Types::PermissionTypes::Project.prepend_if_ee('EE::Types::PermissionTypes::Project')
...@@ -79,4 +79,4 @@ module AppearancesHelper ...@@ -79,4 +79,4 @@ module AppearancesHelper
end end
end end
AppearancesHelper.prepend(EE::AppearancesHelper) AppearancesHelper.prepend_if_ee('EE::AppearancesHelper')
...@@ -307,4 +307,4 @@ module ApplicationHelper ...@@ -307,4 +307,4 @@ module ApplicationHelper
end end
end end
ApplicationHelper.prepend(EE::ApplicationHelper) ApplicationHelper.prepend_if_ee('EE::ApplicationHelper')
...@@ -293,8 +293,8 @@ module ApplicationSettingsHelper ...@@ -293,8 +293,8 @@ module ApplicationSettingsHelper
end end
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 # The methods in `EE::ApplicationSettingsHelper` should be available as both
# instance and class methods. # instance and class methods.
ApplicationSettingsHelper.extend(EE::ApplicationSettingsHelper) ApplicationSettingsHelper.extend_if_ee('EE::ApplicationSettingsHelper')
...@@ -111,8 +111,8 @@ module AuthHelper ...@@ -111,8 +111,8 @@ module AuthHelper
extend self extend self
end 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 # The methods added in EE should be available as both class and instance
# methods, just like the methods provided by `AuthHelper` itself. # methods, just like the methods provided by `AuthHelper` itself.
AuthHelper.extend(EE::AuthHelper) AuthHelper.extend_if_ee('EE::AuthHelper')
...@@ -17,4 +17,4 @@ module AwardEmojiHelper ...@@ -17,4 +17,4 @@ module AwardEmojiHelper
end end
end end
AwardEmojiHelper.prepend(EE::AwardEmojiHelper) AwardEmojiHelper.prepend_if_ee('EE::AwardEmojiHelper')
...@@ -108,4 +108,4 @@ module BoardsHelper ...@@ -108,4 +108,4 @@ module BoardsHelper
end end
end end
BoardsHelper.prepend(EE::BoardsHelper) BoardsHelper.prepend_if_ee('EE::BoardsHelper')
...@@ -10,4 +10,4 @@ module BranchesHelper ...@@ -10,4 +10,4 @@ module BranchesHelper
end end
end end
BranchesHelper.prepend(EE::BranchesHelper) BranchesHelper.prepend_if_ee('EE::BranchesHelper')
...@@ -98,4 +98,4 @@ module ButtonHelper ...@@ -98,4 +98,4 @@ module ButtonHelper
end end
end end
ButtonHelper.prepend(EE::ButtonHelper) ButtonHelper.prepend_if_ee('EE::ButtonHelper')
...@@ -22,4 +22,4 @@ module ClustersHelper ...@@ -22,4 +22,4 @@ module ClustersHelper
end end
end end
ClustersHelper.prepend(EE::ClustersHelper) ClustersHelper.prepend_if_ee('EE::ClustersHelper')
...@@ -53,4 +53,4 @@ module DashboardHelper ...@@ -53,4 +53,4 @@ module DashboardHelper
end end
end end
DashboardHelper.prepend(EE::DashboardHelper) DashboardHelper.prepend_if_ee('EE::DashboardHelper')
...@@ -188,4 +188,4 @@ module EmailsHelper ...@@ -188,4 +188,4 @@ module EmailsHelper
end end
end end
EmailsHelper.prepend(EE::EmailsHelper) EmailsHelper.prepend_if_ee('EE::EmailsHelper')
...@@ -195,4 +195,4 @@ module GitlabRoutingHelper ...@@ -195,4 +195,4 @@ module GitlabRoutingHelper
end end
end end
GitlabRoutingHelper.include(EE::GitlabRoutingHelper) GitlabRoutingHelper.include_if_ee('EE::GitlabRoutingHelper')
...@@ -6,4 +6,4 @@ module Groups::GroupMembersHelper ...@@ -6,4 +6,4 @@ module Groups::GroupMembersHelper
end end
end end
Groups::GroupMembersHelper.prepend(EE::Groups::GroupMembersHelper) Groups::GroupMembersHelper.prepend_if_ee('EE::Groups::GroupMembersHelper')
...@@ -198,4 +198,4 @@ module GroupsHelper ...@@ -198,4 +198,4 @@ module GroupsHelper
end end
end end
GroupsHelper.prepend(EE::GroupsHelper) GroupsHelper.prepend_if_ee('EE::GroupsHelper')
...@@ -444,4 +444,4 @@ module IssuablesHelper ...@@ -444,4 +444,4 @@ module IssuablesHelper
end end
end end
IssuablesHelper.prepend(EE::IssuablesHelper) IssuablesHelper.prepend_if_ee('EE::IssuablesHelper')
...@@ -156,4 +156,4 @@ module IssuesHelper ...@@ -156,4 +156,4 @@ module IssuesHelper
module_function :url_for_tracker_issue module_function :url_for_tracker_issue
end end
IssuesHelper.include(EE::IssuesHelper) IssuesHelper.include_if_ee('EE::IssuesHelper')
...@@ -10,4 +10,4 @@ module KerberosSpnegoHelper ...@@ -10,4 +10,4 @@ module KerberosSpnegoHelper
end end
end end
KerberosSpnegoHelper.prepend(EE::KerberosSpnegoHelper) KerberosSpnegoHelper.prepend_if_ee('EE::KerberosSpnegoHelper')
...@@ -252,4 +252,4 @@ module LabelsHelper ...@@ -252,4 +252,4 @@ module LabelsHelper
module_function :render_colored_label, :text_color_for_bg, :escape_once, :label_tooltip_title module_function :render_colored_label, :text_color_for_bg, :escape_once, :label_tooltip_title
end end
LabelsHelper.prepend(EE::LabelsHelper) LabelsHelper.prepend_if_ee('EE::LabelsHelper')
...@@ -160,4 +160,4 @@ module MergeRequestsHelper ...@@ -160,4 +160,4 @@ module MergeRequestsHelper
end end
end end
MergeRequestsHelper.prepend(EE::MergeRequestsHelper) MergeRequestsHelper.prepend_if_ee('EE::MergeRequestsHelper')
...@@ -260,4 +260,4 @@ module MilestonesHelper ...@@ -260,4 +260,4 @@ module MilestonesHelper
end end
end end
MilestonesHelper.prepend(EE::MilestonesHelper) MilestonesHelper.prepend_if_ee('EE::MilestonesHelper')
...@@ -13,4 +13,4 @@ module MirrorHelper ...@@ -13,4 +13,4 @@ module MirrorHelper
end end
end end
MirrorHelper.prepend(EE::MirrorHelper) MirrorHelper.prepend_if_ee('EE::MirrorHelper')
...@@ -89,4 +89,4 @@ module NamespacesHelper ...@@ -89,4 +89,4 @@ module NamespacesHelper
end end
end end
NamespacesHelper.include(EE::NamespacesHelper) NamespacesHelper.include_if_ee('EE::NamespacesHelper')
...@@ -91,4 +91,4 @@ module NavHelper ...@@ -91,4 +91,4 @@ module NavHelper
end end
end end
NavHelper.prepend(EE::NavHelper) NavHelper.prepend_if_ee('EE::NavHelper')
...@@ -187,4 +187,4 @@ module NotesHelper ...@@ -187,4 +187,4 @@ module NotesHelper
end end
end end
NotesHelper.prepend(EE::NotesHelper) NotesHelper.prepend_if_ee('EE::NotesHelper')
...@@ -6,4 +6,4 @@ module OnboardingExperimentHelper ...@@ -6,4 +6,4 @@ module OnboardingExperimentHelper
end end
end end
OnboardingExperimentHelper.prepend(EE::OnboardingExperimentHelper) OnboardingExperimentHelper.prepend_if_ee('EE::OnboardingExperimentHelper')
...@@ -88,4 +88,4 @@ module PreferencesHelper ...@@ -88,4 +88,4 @@ module PreferencesHelper
end end
end end
PreferencesHelper.prepend(EE::PreferencesHelper) PreferencesHelper.prepend_if_ee('EE::PreferencesHelper')
...@@ -6,4 +6,4 @@ module RecaptchaExperimentHelper ...@@ -6,4 +6,4 @@ module RecaptchaExperimentHelper
end end
end end
RecaptchaExperimentHelper.prepend(EE::RecaptchaExperimentHelper) RecaptchaExperimentHelper.prepend_if_ee('EE::RecaptchaExperimentHelper')
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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