Commit ded4a188 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '325800-generalize-prepend_mod' into 'master'

Rename `prepend_if_ee` to `prepend_mod_with` and unify how we use them [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!61038
parents 2afe9c85 cd68bb18
...@@ -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_if_ee('EE::Admin::ApplicationController') Admin::ApplicationController.prepend_mod_with('Admin::ApplicationController')
...@@ -292,4 +292,4 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController ...@@ -292,4 +292,4 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
end end
end end
Admin::ApplicationSettingsController.prepend_if_ee('EE::Admin::ApplicationSettingsController') Admin::ApplicationSettingsController.prepend_mod_with('Admin::ApplicationSettingsController')
...@@ -24,4 +24,4 @@ class Admin::DashboardController < Admin::ApplicationController ...@@ -24,4 +24,4 @@ class Admin::DashboardController < Admin::ApplicationController
end end
end end
Admin::DashboardController.prepend_if_ee('EE::Admin::DashboardController') Admin::DashboardController.prepend_mod_with('Admin::DashboardController')
...@@ -24,4 +24,4 @@ class Admin::DevOpsReportController < Admin::ApplicationController ...@@ -24,4 +24,4 @@ class Admin::DevOpsReportController < Admin::ApplicationController
end end
end end
Admin::DevOpsReportController.prepend_if_ee('EE::Admin::DevOpsReportController') Admin::DevOpsReportController.prepend_mod_with('Admin::DevOpsReportController')
...@@ -117,4 +117,4 @@ class Admin::GroupsController < Admin::ApplicationController ...@@ -117,4 +117,4 @@ class Admin::GroupsController < Admin::ApplicationController
end end
end end
Admin::GroupsController.prepend_if_ee('EE::Admin::GroupsController') Admin::GroupsController.prepend_mod_with('Admin::GroupsController')
...@@ -14,4 +14,4 @@ class Admin::HealthCheckController < Admin::ApplicationController ...@@ -14,4 +14,4 @@ class Admin::HealthCheckController < Admin::ApplicationController
end end
end end
Admin::HealthCheckController.prepend_if_ee('EE::Admin::HealthCheckController') Admin::HealthCheckController.prepend_mod_with('Admin::HealthCheckController')
...@@ -89,4 +89,4 @@ class Admin::ProjectsController < Admin::ApplicationController ...@@ -89,4 +89,4 @@ class Admin::ProjectsController < Admin::ApplicationController
end end
end end
Admin::ProjectsController.prepend_if_ee('EE::Admin::ProjectsController') Admin::ProjectsController.prepend_mod_with('Admin::ProjectsController')
...@@ -344,4 +344,4 @@ class Admin::UsersController < Admin::ApplicationController ...@@ -344,4 +344,4 @@ class Admin::UsersController < Admin::ApplicationController
end end
end end
Admin::UsersController.prepend_if_ee('EE::Admin::UsersController') Admin::UsersController.prepend_mod_with('Admin::UsersController')
...@@ -556,4 +556,4 @@ class ApplicationController < ActionController::Base ...@@ -556,4 +556,4 @@ class ApplicationController < ActionController::Base
end end
end end
ApplicationController.prepend_ee_mod ApplicationController.prepend_mod
...@@ -71,4 +71,4 @@ class AutocompleteController < ApplicationController ...@@ -71,4 +71,4 @@ class AutocompleteController < ApplicationController
end end
end end
AutocompleteController.prepend_if_ee('EE::AutocompleteController') AutocompleteController.prepend_mod_with('AutocompleteController')
...@@ -158,4 +158,4 @@ module Boards ...@@ -158,4 +158,4 @@ module Boards
end end
end end
Boards::IssuesController.prepend_if_ee('EE::Boards::IssuesController') Boards::IssuesController.prepend_mod_with('Boards::IssuesController')
...@@ -99,4 +99,4 @@ module Boards ...@@ -99,4 +99,4 @@ module Boards
end end
end end
Boards::ListsController.prepend_if_ee('EE::Boards::ListsController') Boards::ListsController.prepend_mod_with('Boards::ListsController')
...@@ -362,4 +362,4 @@ class Clusters::ClustersController < Clusters::BaseController ...@@ -362,4 +362,4 @@ class Clusters::ClustersController < Clusters::BaseController
end end
end end
Clusters::ClustersController.prepend_if_ee('EE::Clusters::ClustersController') Clusters::ClustersController.prepend_mod_with('Clusters::ClustersController')
...@@ -177,4 +177,4 @@ module AuthenticatesWithTwoFactor ...@@ -177,4 +177,4 @@ module AuthenticatesWithTwoFactor
end end
end end
AuthenticatesWithTwoFactor.prepend_if_ee('EE::AuthenticatesWithTwoFactor') AuthenticatesWithTwoFactor.prepend_mod_with('AuthenticatesWithTwoFactor')
...@@ -65,4 +65,4 @@ module BoardsActions ...@@ -65,4 +65,4 @@ module BoardsActions
end end
end end
BoardsActions.prepend_if_ee('EE::BoardsActions') BoardsActions.prepend_mod_with('BoardsActions')
...@@ -91,4 +91,4 @@ module BoardsResponses ...@@ -91,4 +91,4 @@ module BoardsResponses
end end
end end
BoardsResponses.prepend_if_ee('EE::BoardsResponses') BoardsResponses.prepend_mod_with('BoardsResponses')
...@@ -43,4 +43,4 @@ module CycleAnalyticsParams ...@@ -43,4 +43,4 @@ module CycleAnalyticsParams
end end
end end
CycleAnalyticsParams.prepend_if_ee('EE::CycleAnalyticsParams') CycleAnalyticsParams.prepend_mod_with('CycleAnalyticsParams')
...@@ -72,4 +72,4 @@ module EnforcesTwoFactorAuthentication ...@@ -72,4 +72,4 @@ module EnforcesTwoFactorAuthentication
end end
end end
EnforcesTwoFactorAuthentication.prepend_if_ee('EE::EnforcesTwoFactorAuthentication') EnforcesTwoFactorAuthentication.prepend_mod_with('EnforcesTwoFactorAuthentication')
...@@ -102,4 +102,4 @@ module Integrations ...@@ -102,4 +102,4 @@ module Integrations
end end
end end
Integrations::Params.prepend_if_ee('EE::Integrations::Params') Integrations::Params.prepend_mod_with('Integrations::Params')
...@@ -46,4 +46,4 @@ module InternalRedirect ...@@ -46,4 +46,4 @@ module InternalRedirect
end end
end end
InternalRedirect.prepend_if_ee('EE::InternalRedirect') InternalRedirect.prepend_mod_with('InternalRedirect')
...@@ -259,4 +259,4 @@ module IssuableActions ...@@ -259,4 +259,4 @@ module IssuableActions
# rubocop:enable Gitlab/ModuleWithInstanceVariables # rubocop:enable Gitlab/ModuleWithInstanceVariables
end end
IssuableActions.prepend_if_ee('EE::IssuableActions') IssuableActions.prepend_mod_with('IssuableActions')
...@@ -158,4 +158,4 @@ module IssuableCollections ...@@ -158,4 +158,4 @@ module IssuableCollections
# rubocop:enable Gitlab/ModuleWithInstanceVariables # rubocop:enable Gitlab/ModuleWithInstanceVariables
end end
IssuableCollections.prepend_if_ee('EE::IssuableCollections') IssuableCollections.prepend_mod_with('IssuableCollections')
...@@ -136,4 +136,4 @@ module LfsRequest ...@@ -136,4 +136,4 @@ module LfsRequest
end end
end end
LfsRequest.prepend_if_ee('EE::LfsRequest') LfsRequest.prepend_mod_with('LfsRequest')
...@@ -187,4 +187,4 @@ module MembershipActions ...@@ -187,4 +187,4 @@ module MembershipActions
end end
end end
MembershipActions.prepend_if_ee('EE::MembershipActions') MembershipActions.prepend_mod_with('MembershipActions')
...@@ -56,4 +56,4 @@ module RoutableActions ...@@ -56,4 +56,4 @@ module RoutableActions
end end
end end
RoutableActions.prepend_if_ee('EE::RoutableActions') RoutableActions.prepend_mod_with('RoutableActions')
...@@ -36,4 +36,4 @@ class ConfirmationsController < Devise::ConfirmationsController ...@@ -36,4 +36,4 @@ class ConfirmationsController < Devise::ConfirmationsController
end end
end end
ConfirmationsController.prepend_if_ee('EE::ConfirmationsController') ConfirmationsController.prepend_mod_with('ConfirmationsController')
...@@ -116,4 +116,4 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController ...@@ -116,4 +116,4 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
end end
end end
Dashboard::ProjectsController.prepend_if_ee('EE::Dashboard::ProjectsController') Dashboard::ProjectsController.prepend_mod_with('Dashboard::ProjectsController')
...@@ -122,4 +122,4 @@ class Explore::ProjectsController < Explore::ApplicationController ...@@ -122,4 +122,4 @@ class Explore::ProjectsController < Explore::ApplicationController
end end
end end
Explore::ProjectsController.prepend_if_ee('EE::Explore::ProjectsController') Explore::ProjectsController.prepend_mod_with('Explore::ProjectsController')
...@@ -72,4 +72,4 @@ class Groups::ApplicationController < ApplicationController ...@@ -72,4 +72,4 @@ class Groups::ApplicationController < ApplicationController
end end
end end
Groups::ApplicationController.prepend_if_ee('EE::Groups::ApplicationController') Groups::ApplicationController.prepend_mod_with('Groups::ApplicationController')
...@@ -51,4 +51,4 @@ class Groups::AutocompleteSourcesController < Groups::ApplicationController ...@@ -51,4 +51,4 @@ class Groups::AutocompleteSourcesController < Groups::ApplicationController
# rubocop: enable CodeReuse/ActiveRecord # rubocop: enable CodeReuse/ActiveRecord
end end
Groups::AutocompleteSourcesController.prepend_if_ee('EE::Groups::AutocompleteSourcesController') Groups::AutocompleteSourcesController.prepend_mod
...@@ -89,4 +89,4 @@ class Groups::GroupMembersController < Groups::ApplicationController ...@@ -89,4 +89,4 @@ class Groups::GroupMembersController < Groups::ApplicationController
end end
end end
Groups::GroupMembersController.prepend_if_ee('EE::Groups::GroupMembersController') Groups::GroupMembersController.prepend_mod_with('Groups::GroupMembersController')
...@@ -95,4 +95,4 @@ class Groups::MilestonesController < Groups::ApplicationController ...@@ -95,4 +95,4 @@ class Groups::MilestonesController < Groups::ApplicationController
end end
end end
Groups::MilestonesController.prepend_if_ee('EE::Groups::MilestonesController') Groups::MilestonesController.prepend_mod_with('Groups::MilestonesController')
...@@ -100,4 +100,4 @@ module Groups ...@@ -100,4 +100,4 @@ module Groups
end end
end end
Groups::Settings::CiCdController.prepend_if_ee('EE::Groups::Settings::CiCdController') Groups::Settings::CiCdController.prepend_mod_with('Groups::Settings::CiCdController')
...@@ -57,4 +57,4 @@ module Groups ...@@ -57,4 +57,4 @@ module Groups
end end
end end
Groups::VariablesController.prepend_if_ee('EE::Groups::VariablesController') Groups::VariablesController.prepend_mod_with('Groups::VariablesController')
...@@ -365,4 +365,4 @@ class GroupsController < Groups::ApplicationController ...@@ -365,4 +365,4 @@ class GroupsController < Groups::ApplicationController
end end
end end
GroupsController.prepend_if_ee('EE::GroupsController') GroupsController.prepend_mod_with('GroupsController')
...@@ -265,4 +265,4 @@ class Import::GithubController < Import::BaseController ...@@ -265,4 +265,4 @@ class Import::GithubController < Import::BaseController
end end
end end
Import::GithubController.prepend_if_ee('EE::Import::GithubController') Import::GithubController.prepend_mod_with('Import::GithubController')
...@@ -38,4 +38,4 @@ class Ldap::OmniauthCallbacksController < OmniauthCallbacksController ...@@ -38,4 +38,4 @@ class Ldap::OmniauthCallbacksController < OmniauthCallbacksController
end end
end end
Ldap::OmniauthCallbacksController.prepend_if_ee('EE::Ldap::OmniauthCallbacksController') Ldap::OmniauthCallbacksController.prepend_mod_with('Ldap::OmniauthCallbacksController')
...@@ -289,4 +289,4 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController ...@@ -289,4 +289,4 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
end end
end end
OmniauthCallbacksController.prepend_if_ee('EE::OmniauthCallbacksController') OmniauthCallbacksController.prepend_mod_with('OmniauthCallbacksController')
...@@ -69,4 +69,4 @@ class PasswordsController < Devise::PasswordsController ...@@ -69,4 +69,4 @@ class PasswordsController < Devise::PasswordsController
end end
end end
PasswordsController.prepend_if_ee('EE::PasswordsController') PasswordsController.prepend_mod_with('PasswordsController')
...@@ -37,4 +37,4 @@ class Profiles::AccountsController < Profiles::ApplicationController ...@@ -37,4 +37,4 @@ class Profiles::AccountsController < Profiles::ApplicationController
end end
end end
Profiles::AccountsController.prepend_if_ee('EE::Profiles::AccountsController') Profiles::AccountsController.prepend_mod_with('Profiles::AccountsController')
...@@ -60,4 +60,4 @@ class Profiles::PersonalAccessTokensController < Profiles::ApplicationController ...@@ -60,4 +60,4 @@ class Profiles::PersonalAccessTokensController < Profiles::ApplicationController
end end
end end
Profiles::PersonalAccessTokensController.prepend_if_ee('EE::Profiles::PersonalAccessTokensController') Profiles::PersonalAccessTokensController.prepend_mod_with('Profiles::PersonalAccessTokensController')
...@@ -55,4 +55,4 @@ class Profiles::PreferencesController < Profiles::ApplicationController ...@@ -55,4 +55,4 @@ class Profiles::PreferencesController < Profiles::ApplicationController
end end
end end
Profiles::PreferencesController.prepend_if_ee('::EE::Profiles::PreferencesController') Profiles::PreferencesController.prepend_mod_with('Profiles::PreferencesController')
...@@ -49,4 +49,4 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController ...@@ -49,4 +49,4 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController
end end
end end
Projects::AutocompleteSourcesController.prepend_if_ee('EE::Projects::AutocompleteSourcesController') Projects::AutocompleteSourcesController.prepend_mod_with('Projects::AutocompleteSourcesController')
...@@ -264,4 +264,4 @@ class Projects::EnvironmentsController < Projects::ApplicationController ...@@ -264,4 +264,4 @@ class Projects::EnvironmentsController < Projects::ApplicationController
end end
end end
Projects::EnvironmentsController.prepend_if_ee('EE::Projects::EnvironmentsController') Projects::EnvironmentsController.prepend_mod_with('Projects::EnvironmentsController')
...@@ -131,4 +131,4 @@ class Projects::ForksController < Projects::ApplicationController ...@@ -131,4 +131,4 @@ class Projects::ForksController < Projects::ApplicationController
end end
end end
Projects::ForksController.prepend_if_ee('EE::Projects::ForksController') Projects::ForksController.prepend_mod_with('Projects::ForksController')
...@@ -60,4 +60,4 @@ class Projects::GroupLinksController < Projects::ApplicationController ...@@ -60,4 +60,4 @@ class Projects::GroupLinksController < Projects::ApplicationController
end end
end end
Projects::GroupLinksController.prepend_if_ee('EE::Projects::GroupLinksController') Projects::GroupLinksController.prepend_mod_with('Projects::GroupLinksController')
...@@ -81,4 +81,4 @@ class Projects::ImportsController < Projects::ApplicationController ...@@ -81,4 +81,4 @@ class Projects::ImportsController < Projects::ApplicationController
end end
end end
Projects::ImportsController.prepend_if_ee('EE::Projects::ImportsController') Projects::ImportsController.prepend_mod_with('Projects::ImportsController')
...@@ -391,4 +391,4 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -391,4 +391,4 @@ class Projects::IssuesController < Projects::ApplicationController
def create_vulnerability_issue_feedback(issue); end def create_vulnerability_issue_feedback(issue); end
end end
Projects::IssuesController.prepend_if_ee('EE::Projects::IssuesController') Projects::IssuesController.prepend_mod_with('Projects::IssuesController')
...@@ -65,4 +65,4 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont ...@@ -65,4 +65,4 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont
end end
end end
Projects::MergeRequests::ApplicationController.prepend_if_ee('EE::Projects::MergeRequests::ApplicationController') Projects::MergeRequests::ApplicationController.prepend_mod_with('Projects::MergeRequests::ApplicationController')
...@@ -141,4 +141,4 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap ...@@ -141,4 +141,4 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap
end end
end end
Projects::MergeRequests::CreationsController.prepend_ee_mod Projects::MergeRequests::CreationsController.prepend_mod
...@@ -534,4 +534,4 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo ...@@ -534,4 +534,4 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
end end
end end
Projects::MergeRequestsController.prepend_if_ee('EE::Projects::MergeRequestsController') Projects::MergeRequestsController.prepend_mod_with('Projects::MergeRequestsController')
...@@ -94,4 +94,4 @@ class Projects::MirrorsController < Projects::ApplicationController ...@@ -94,4 +94,4 @@ class Projects::MirrorsController < Projects::ApplicationController
end end
end end
Projects::MirrorsController.prepend_if_ee('EE::Projects::MirrorsController') Projects::MirrorsController.prepend_mod_with('Projects::MirrorsController')
...@@ -55,4 +55,4 @@ class Projects::PagesController < Projects::ApplicationController ...@@ -55,4 +55,4 @@ class Projects::PagesController < Projects::ApplicationController
end end
end end
Projects::PagesController.prepend_if_ee('EE::Projects::PagesController') Projects::PagesController.prepend_mod_with('Projects::PagesController')
...@@ -309,4 +309,4 @@ class Projects::PipelinesController < Projects::ApplicationController ...@@ -309,4 +309,4 @@ class Projects::PipelinesController < Projects::ApplicationController
end end
end end
Projects::PipelinesController.prepend_if_ee('EE::Projects::PipelinesController') Projects::PipelinesController.prepend_mod_with('Projects::PipelinesController')
...@@ -64,4 +64,4 @@ class Projects::ProjectMembersController < Projects::ApplicationController ...@@ -64,4 +64,4 @@ class Projects::ProjectMembersController < Projects::ApplicationController
end end
end end
Projects::ProjectMembersController.prepend_if_ee('EE::Projects::ProjectMembersController') Projects::ProjectMembersController.prepend_mod_with('Projects::ProjectMembersController')
...@@ -29,4 +29,4 @@ class Projects::ProtectedBranchesController < Projects::ProtectedRefsController ...@@ -29,4 +29,4 @@ class Projects::ProtectedBranchesController < Projects::ProtectedRefsController
end end
end end
Projects::ProtectedBranchesController.prepend_if_ee('EE::Projects::ProtectedBranchesController') Projects::ProtectedBranchesController.prepend_mod_with('Projects::ProtectedBranchesController')
...@@ -68,4 +68,4 @@ class Projects::ProtectedRefsController < Projects::ApplicationController ...@@ -68,4 +68,4 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
end end
end end
Projects::ProtectedRefsController.prepend_if_ee('EE::Projects::ProtectedRefsController') Projects::ProtectedRefsController.prepend_mod_with('Projects::ProtectedRefsController')
...@@ -127,4 +127,4 @@ class Projects::RepositoriesController < Projects::ApplicationController ...@@ -127,4 +127,4 @@ class Projects::RepositoriesController < Projects::ApplicationController
end end
end end
Projects::RepositoriesController.prepend_if_ee('EE::Projects::RepositoriesController') Projects::RepositoriesController.prepend_mod_with('Projects::RepositoriesController')
...@@ -14,4 +14,4 @@ module Projects ...@@ -14,4 +14,4 @@ module Projects
end end
end end
Projects::Security::ConfigurationController.prepend_if_ee('EE::Projects::Security::ConfigurationController') Projects::Security::ConfigurationController.prepend_mod_with('Projects::Security::ConfigurationController')
...@@ -160,4 +160,4 @@ module Projects ...@@ -160,4 +160,4 @@ module Projects
end end
end end
Projects::Settings::CiCdController.prepend_if_ee('EE::Projects::Settings::CiCdController') Projects::Settings::CiCdController.prepend_mod_with('Projects::Settings::CiCdController')
...@@ -155,4 +155,4 @@ module Projects ...@@ -155,4 +155,4 @@ module Projects
end end
end end
Projects::Settings::OperationsController.prepend_if_ee('::EE::Projects::Settings::OperationsController') Projects::Settings::OperationsController.prepend_mod_with('Projects::Settings::OperationsController')
...@@ -134,4 +134,4 @@ module Projects ...@@ -134,4 +134,4 @@ module Projects
end end
end end
Projects::Settings::RepositoryController.prepend_if_ee('EE::Projects::Settings::RepositoryController') Projects::Settings::RepositoryController.prepend_mod_with('Projects::Settings::RepositoryController')
...@@ -545,4 +545,4 @@ class ProjectsController < Projects::ApplicationController ...@@ -545,4 +545,4 @@ class ProjectsController < Projects::ApplicationController
end end
end end
ProjectsController.prepend_if_ee('EE::ProjectsController') ProjectsController.prepend_mod_with('ProjectsController')
...@@ -70,4 +70,4 @@ module Registrations ...@@ -70,4 +70,4 @@ module Registrations
end end
end end
Registrations::WelcomeController.prepend_if_ee('EE::Registrations::WelcomeController') Registrations::WelcomeController.prepend_mod_with('Registrations::WelcomeController')
...@@ -203,4 +203,4 @@ class RegistrationsController < Devise::RegistrationsController ...@@ -203,4 +203,4 @@ class RegistrationsController < Devise::RegistrationsController
end end
end end
RegistrationsController.prepend_if_ee('EE::RegistrationsController') RegistrationsController.prepend_mod_with('RegistrationsController')
...@@ -134,4 +134,4 @@ module Repositories ...@@ -134,4 +134,4 @@ module Repositories
end end
end end
Repositories::GitHttpClientController.prepend_if_ee('EE::Repositories::GitHttpClientController') Repositories::GitHttpClientController.prepend_mod_with('Repositories::GitHttpClientController')
...@@ -122,4 +122,4 @@ module Repositories ...@@ -122,4 +122,4 @@ module Repositories
end end
end end
Repositories::GitHttpController.prepend_if_ee('EE::Repositories::GitHttpController') Repositories::GitHttpController.prepend_mod_with('Repositories::GitHttpController')
...@@ -148,4 +148,4 @@ module Repositories ...@@ -148,4 +148,4 @@ module Repositories
end end
end end
Repositories::LfsApiController.prepend_if_ee('EE::Repositories::LfsApiController') Repositories::LfsApiController.prepend_mod_with('Repositories::LfsApiController')
...@@ -70,4 +70,4 @@ class RootController < Dashboard::ProjectsController ...@@ -70,4 +70,4 @@ class RootController < Dashboard::ProjectsController
end end
end end
RootController.prepend_if_ee('EE::RootController') RootController.prepend_mod_with('RootController')
...@@ -152,4 +152,4 @@ class SearchController < ApplicationController ...@@ -152,4 +152,4 @@ class SearchController < ApplicationController
end end
end end
SearchController.prepend_if_ee('EE::SearchController') SearchController.prepend_mod_with('SearchController')
...@@ -53,4 +53,4 @@ class SentNotificationsController < ApplicationController ...@@ -53,4 +53,4 @@ class SentNotificationsController < ApplicationController
end end
end end
SentNotificationsController.prepend_if_ee('EE::SentNotificationsController') SentNotificationsController.prepend_mod_with('SentNotificationsController')
...@@ -315,4 +315,4 @@ class SessionsController < Devise::SessionsController ...@@ -315,4 +315,4 @@ class SessionsController < Devise::SessionsController
end end
end end
SessionsController.prepend_if_ee('EE::SessionsController') SessionsController.prepend_mod_with('SessionsController')
...@@ -117,4 +117,4 @@ class UploadsController < ApplicationController ...@@ -117,4 +117,4 @@ class UploadsController < ApplicationController
end end
end end
UploadsController.prepend_if_ee('EE::UploadsController') UploadsController.prepend_mod_with('UploadsController')
...@@ -260,4 +260,4 @@ class UsersController < ApplicationController ...@@ -260,4 +260,4 @@ class UsersController < ApplicationController
end end
end end
UsersController.prepend_if_ee('EE::UsersController') UsersController.prepend_mod_with('UsersController')
...@@ -67,4 +67,4 @@ module AlertManagement ...@@ -67,4 +67,4 @@ module AlertManagement
end end
end end
AlertManagement::AlertsFinder.prepend_if_ee('EE::AlertManagement::AlertsFinder') AlertManagement::AlertsFinder.prepend_mod_with('AlertManagement::AlertsFinder')
...@@ -51,4 +51,4 @@ module AlertManagement ...@@ -51,4 +51,4 @@ module AlertManagement
end end
end end
::AlertManagement::HttpIntegrationsFinder.prepend_if_ee('EE::AlertManagement::HttpIntegrationsFinder') ::AlertManagement::HttpIntegrationsFinder.prepend_mod_with('AlertManagement::HttpIntegrationsFinder')
...@@ -102,4 +102,4 @@ module Autocomplete ...@@ -102,4 +102,4 @@ module Autocomplete
end end
end end
Autocomplete::UsersFinder.prepend_if_ee('EE::Autocomplete::UsersFinder') Autocomplete::UsersFinder.prepend_mod_with('Autocomplete::UsersFinder')
...@@ -94,4 +94,4 @@ module Ci ...@@ -94,4 +94,4 @@ module Ci
end end
end end
Ci::DailyBuildGroupReportResultsFinder.prepend_if_ee('::EE::Ci::DailyBuildGroupReportResultsFinder') Ci::DailyBuildGroupReportResultsFinder.prepend_mod_with('Ci::DailyBuildGroupReportResultsFinder')
...@@ -19,4 +19,4 @@ class ForkTargetsFinder ...@@ -19,4 +19,4 @@ class ForkTargetsFinder
attr_reader :project, :user attr_reader :project, :user
end end
ForkTargetsFinder.prepend_if_ee('EE::ForkTargetsFinder') ForkTargetsFinder.prepend_mod_with('ForkTargetsFinder')
...@@ -88,4 +88,4 @@ class GroupMembersFinder < UnionFinder ...@@ -88,4 +88,4 @@ class GroupMembersFinder < UnionFinder
end end
end end
GroupMembersFinder.prepend_if_ee('EE::GroupMembersFinder') GroupMembersFinder.prepend_mod_with('GroupMembersFinder')
...@@ -126,4 +126,4 @@ class GroupProjectsFinder < ProjectsFinder ...@@ -126,4 +126,4 @@ class GroupProjectsFinder < ProjectsFinder
end end
end end
GroupProjectsFinder.prepend_if_ee('EE::GroupProjectsFinder') GroupProjectsFinder.prepend_mod_with('GroupProjectsFinder')
...@@ -117,4 +117,4 @@ class IssuesFinder < IssuableFinder ...@@ -117,4 +117,4 @@ class IssuesFinder < IssuableFinder
end end
end end
IssuesFinder.prepend_if_ee('EE::IssuesFinder') IssuesFinder.prepend_mod_with('IssuesFinder')
...@@ -45,4 +45,4 @@ class IssuesFinder ...@@ -45,4 +45,4 @@ class IssuesFinder
end end
end end
IssuesFinder::Params.prepend_if_ee('EE::IssuesFinder::Params') IssuesFinder::Params.prepend_mod_with('IssuesFinder::Params')
...@@ -56,4 +56,4 @@ class LicenseTemplateFinder ...@@ -56,4 +56,4 @@ class LicenseTemplateFinder
end end
end end
LicenseTemplateFinder.prepend_if_ee('::EE::LicenseTemplateFinder') LicenseTemplateFinder.prepend_mod_with('LicenseTemplateFinder')
...@@ -220,4 +220,4 @@ class MergeRequestsFinder < IssuableFinder ...@@ -220,4 +220,4 @@ class MergeRequestsFinder < IssuableFinder
end end
end end
MergeRequestsFinder.prepend_if_ee('EE::MergeRequestsFinder') MergeRequestsFinder.prepend_mod_with('MergeRequestsFinder')
...@@ -60,4 +60,4 @@ module Namespaces ...@@ -60,4 +60,4 @@ module Namespaces
end end
end end
Namespaces::ProjectsFinder.prepend_if_ee('::EE::Namespaces::ProjectsFinder') Namespaces::ProjectsFinder.prepend_mod_with('Namespaces::ProjectsFinder')
...@@ -183,4 +183,4 @@ class NotesFinder ...@@ -183,4 +183,4 @@ class NotesFinder
end end
end end
NotesFinder.prepend_if_ee('EE::NotesFinder') NotesFinder.prepend_mod_with('NotesFinder')
...@@ -247,4 +247,4 @@ class ProjectsFinder < UnionFinder ...@@ -247,4 +247,4 @@ class ProjectsFinder < UnionFinder
end end
end end
ProjectsFinder.prepend_if_ee('::EE::ProjectsFinder') ProjectsFinder.prepend_mod_with('ProjectsFinder')
...@@ -221,4 +221,4 @@ class SnippetsFinder < UnionFinder ...@@ -221,4 +221,4 @@ class SnippetsFinder < UnionFinder
end end
end end
SnippetsFinder.prepend_if_ee('EE::SnippetsFinder') SnippetsFinder.prepend_mod_with('SnippetsFinder')
...@@ -70,4 +70,4 @@ class TemplateFinder ...@@ -70,4 +70,4 @@ class TemplateFinder
end end
end end
TemplateFinder.prepend_if_ee('::EE::TemplateFinder') TemplateFinder.prepend_mod_with('TemplateFinder')
...@@ -215,4 +215,4 @@ class TodosFinder ...@@ -215,4 +215,4 @@ class TodosFinder
end end
end end
TodosFinder.prepend_if_ee('EE::TodosFinder') TodosFinder.prepend_mod_with('TodosFinder')
...@@ -143,4 +143,4 @@ class UsersFinder ...@@ -143,4 +143,4 @@ class UsersFinder
# rubocop: enable CodeReuse/ActiveRecord # rubocop: enable CodeReuse/ActiveRecord
end end
UsersFinder.prepend_if_ee('EE::UsersFinder') UsersFinder.prepend_mod_with('UsersFinder')
...@@ -170,7 +170,7 @@ class GitlabSchema < GraphQL::Schema ...@@ -170,7 +170,7 @@ class GitlabSchema < GraphQL::Schema
end end
end end
GitlabSchema.prepend_if_ee('EE::GitlabSchema') # rubocop: disable Cop/InjectEnterpriseEditionModule GitlabSchema.prepend_mod_with('GitlabSchema') # rubocop: disable Cop/InjectEnterpriseEditionModule
# Force the schema to load as a workaround for intermittent errors we # Force the schema to load as a workaround for intermittent errors we
# see due to a lack of thread safety. # see due to a lack of thread safety.
......
...@@ -34,4 +34,4 @@ module Mutations ...@@ -34,4 +34,4 @@ module Mutations
end end
end end
Mutations::AlertManagement::HttpIntegration::Create.prepend_if_ee('::EE::Mutations::AlertManagement::HttpIntegration::Create') Mutations::AlertManagement::HttpIntegration::Create.prepend_mod_with('Mutations::AlertManagement::HttpIntegration::Create')
...@@ -33,4 +33,4 @@ module Mutations ...@@ -33,4 +33,4 @@ module Mutations
end end
end end
Mutations::AlertManagement::HttpIntegration::HttpIntegrationBase.prepend_if_ee('::EE::Mutations::AlertManagement::HttpIntegration::HttpIntegrationBase') Mutations::AlertManagement::HttpIntegration::HttpIntegrationBase.prepend_mod_with('Mutations::AlertManagement::HttpIntegration::HttpIntegrationBase')
...@@ -32,4 +32,4 @@ module Mutations ...@@ -32,4 +32,4 @@ module Mutations
end end
end end
Mutations::AlertManagement::HttpIntegration::Update.prepend_if_ee('::EE::Mutations::AlertManagement::HttpIntegration::Update') Mutations::AlertManagement::HttpIntegration::Update.prepend_mod_with('Mutations::AlertManagement::HttpIntegration::Update')
...@@ -30,4 +30,4 @@ module Mutations ...@@ -30,4 +30,4 @@ module Mutations
end end
end end
Mutations::Boards::Create.prepend_if_ee('::EE::Mutations::Boards::Create') Mutations::Boards::Create.prepend_mod_with('Mutations::Boards::Create')
...@@ -86,4 +86,4 @@ module Mutations ...@@ -86,4 +86,4 @@ module Mutations
end end
end end
Mutations::Boards::Issues::IssueMoveList.prepend_if_ee('EE::Mutations::Boards::Issues::IssueMoveList') Mutations::Boards::Issues::IssueMoveList.prepend_mod_with('Mutations::Boards::Issues::IssueMoveList')
...@@ -34,4 +34,4 @@ module Mutations ...@@ -34,4 +34,4 @@ module Mutations
end end
end end
Mutations::Boards::Lists::Create.prepend_if_ee('::EE::Mutations::Boards::Lists::Create') Mutations::Boards::Lists::Create.prepend_mod_with('Mutations::Boards::Lists::Create')
...@@ -42,4 +42,4 @@ module Mutations ...@@ -42,4 +42,4 @@ module Mutations
end end
end end
Mutations::Boards::Update.prepend_if_ee('::EE::Mutations::Boards::Update') Mutations::Boards::Update.prepend_mod_with('Mutations::Boards::Update')
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.
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.
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