diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index e61829399ec..2da22589433 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-4a1b0d4018ee35cfe786ba3dd975b20013a39e39
+8d525bfb986a26ee6c1c6d0ec976fa2614928cf8
diff --git a/app/assets/javascripts/pipeline_editor/components/drawer/pipeline_editor_drawer.vue b/app/assets/javascripts/pipeline_editor/components/drawer/pipeline_editor_drawer.vue
index e1f38b4332b..3f4da0a0641 100644
--- a/app/assets/javascripts/pipeline_editor/components/drawer/pipeline_editor_drawer.vue
+++ b/app/assets/javascripts/pipeline_editor/components/drawer/pipeline_editor_drawer.vue
@@ -1,6 +1,8 @@
-
+
+
+ {{ __('Collapse') }}
+
+
+
+
+
+
diff --git a/app/assets/javascripts/pipeline_editor/constants.js b/app/assets/javascripts/pipeline_editor/constants.js
index 56862f17858..dba815368eb 100644
--- a/app/assets/javascripts/pipeline_editor/constants.js
+++ b/app/assets/javascripts/pipeline_editor/constants.js
@@ -26,3 +26,5 @@ export const TABS_WITH_COMMIT_FORM = [CREATE_TAB, LINT_TAB, VISUALIZE_TAB];
export const COMMIT_ACTION_CREATE = 'CREATE';
export const COMMIT_ACTION_UPDATE = 'UPDATE';
+
+export const DRAWER_EXPANDED_KEY = 'pipeline_editor_drawer_expanded';
diff --git a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue
index 06ea9188113..5472e51445a 100644
--- a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue
+++ b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue
@@ -21,7 +21,12 @@ import { backOff } from '~/lib/utils/common_utils';
import httpStatusCodes from '~/lib/utils/http_status';
import { redirectTo } from '~/lib/utils/url_utility';
import { s__, __, n__ } from '~/locale';
-import { VARIABLE_TYPE, FILE_TYPE, CONFIG_VARIABLES_TIMEOUT } from '../constants';
+import {
+ VARIABLE_TYPE,
+ FILE_TYPE,
+ CONFIG_VARIABLES_TIMEOUT,
+ CC_VALIDATION_REQUIRED_ERROR,
+} from '../constants';
import filterVariables from '../utils/filter_variables';
import RefsDropdown from './refs_dropdown.vue';
@@ -60,6 +65,8 @@ export default {
GlSprintf,
GlLoadingIcon,
RefsDropdown,
+ CcValidationRequiredAlert: () =>
+ import('ee_component/billings/components/cc_validation_required_alert.vue'),
},
directives: { SafeHtml },
props: {
@@ -143,6 +150,9 @@ export default {
descriptions() {
return this.form[this.refFullName]?.descriptions ?? {};
},
+ ccRequiredError() {
+ return this.error === CC_VALIDATION_REQUIRED_ERROR;
+ },
},
watch: {
refValue() {
@@ -329,8 +339,9 @@ export default {
+
(user) { where(assignee: user) }
end
-IssueAssignee.prepend_if_ee('EE::IssueAssignee')
+IssueAssignee.prepend_mod_with('IssueAssignee')
diff --git a/app/models/issue_link.rb b/app/models/issue_link.rb
index ba97874ed39..920586cc1ba 100644
--- a/app/models/issue_link.rb
+++ b/app/models/issue_link.rb
@@ -46,4 +46,4 @@ class IssueLink < ApplicationRecord
end
end
-IssueLink.prepend_if_ee('EE::IssueLink')
+IssueLink.prepend_mod_with('IssueLink')
diff --git a/app/models/iteration.rb b/app/models/iteration.rb
index 7483d04aab8..71ecbcf1c1a 100644
--- a/app/models/iteration.rb
+++ b/app/models/iteration.rb
@@ -13,4 +13,4 @@ class Iteration < ApplicationRecord
end
end
-Iteration.prepend_if_ee('::EE::Iteration')
+Iteration.prepend_mod_with('Iteration')
diff --git a/app/models/key.rb b/app/models/key.rb
index 131416d1bee..15b3c460b52 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -147,4 +147,4 @@ class Key < ApplicationRecord
end
end
-Key.prepend_if_ee('EE::Key')
+Key.prepend_mod_with('Key')
diff --git a/app/models/label.rb b/app/models/label.rb
index 26faaa90df3..a46d6bc5c0f 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -290,4 +290,4 @@ class Label < ApplicationRecord
end
end
-Label.prepend_if_ee('EE::Label')
+Label.prepend_mod_with('Label')
diff --git a/app/models/label_note.rb b/app/models/label_note.rb
index e90028ce835..19dede36abd 100644
--- a/app/models/label_note.rb
+++ b/app/models/label_note.rb
@@ -79,4 +79,4 @@ class LabelNote < SyntheticNote
end
end
-LabelNote.prepend_if_ee('EE::LabelNote')
+LabelNote.prepend_mod_with('LabelNote')
diff --git a/app/models/legacy_diff_note.rb b/app/models/legacy_diff_note.rb
index df1ad8ea281..25e90036a53 100644
--- a/app/models/legacy_diff_note.rb
+++ b/app/models/legacy_diff_note.rb
@@ -112,4 +112,4 @@ class LegacyDiffNote < Note
end
end
-LegacyDiffNote.prepend_if_ee('EE::LegacyDiffNote')
+LegacyDiffNote.prepend_mod_with('LegacyDiffNote')
diff --git a/app/models/lfs_object.rb b/app/models/lfs_object.rb
index d60baa299cb..b837b902e2d 100644
--- a/app/models/lfs_object.rb
+++ b/app/models/lfs_object.rb
@@ -50,4 +50,4 @@ class LfsObject < ApplicationRecord
end
end
-LfsObject.prepend_if_ee('EE::LfsObject')
+LfsObject.prepend_mod_with('LfsObject')
diff --git a/app/models/list.rb b/app/models/list.rb
index d72afbaee69..fba0e51bdf8 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -49,4 +49,4 @@ class List < ApplicationRecord
end
end
-List.prepend_if_ee('::EE::List')
+List.prepend_mod_with('List')
diff --git a/app/models/member.rb b/app/models/member.rb
index a44b7f0ff7e..ebe125c4770 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -560,4 +560,4 @@ class Member < ApplicationRecord
end
end
-Member.prepend_if_ee('EE::Member')
+Member.prepend_mod_with('Member')
diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb
index 0f9fdd230ff..b22a4fa9ef6 100644
--- a/app/models/members/group_member.rb
+++ b/app/models/members/group_member.rb
@@ -101,4 +101,4 @@ class GroupMember < Member
end
end
-GroupMember.prepend_if_ee('EE::GroupMember')
+GroupMember.prepend_mod_with('GroupMember')
diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index 484237a6dec..41ecc4cbf01 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -154,4 +154,4 @@ class ProjectMember < Member
# rubocop: enable CodeReuse/ServiceClass
end
-ProjectMember.prepend_if_ee('EE::ProjectMember')
+ProjectMember.prepend_mod_with('ProjectMember')
diff --git a/app/models/members_preloader.rb b/app/models/members_preloader.rb
index e9b867308e1..ba7e4b39989 100644
--- a/app/models/members_preloader.rb
+++ b/app/models/members_preloader.rb
@@ -17,4 +17,4 @@ class MembersPreloader
end
end
-MembersPreloader.prepend_if_ee('EE::MembersPreloader')
+MembersPreloader.prepend_mod_with('MembersPreloader')
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index b93aff063bb..34cab691709 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1954,4 +1954,4 @@ class MergeRequest < ApplicationRecord
end
end
-MergeRequest.prepend_if_ee('::EE::MergeRequest')
+MergeRequest.prepend_mod_with('MergeRequest')
diff --git a/app/models/merge_request/metrics.rb b/app/models/merge_request/metrics.rb
index 5c611da0684..b9460afa8e7 100644
--- a/app/models/merge_request/metrics.rb
+++ b/app/models/merge_request/metrics.rb
@@ -31,4 +31,4 @@ class MergeRequest::Metrics < ApplicationRecord
end
end
-MergeRequest::Metrics.prepend_if_ee('EE::MergeRequest::Metrics')
+MergeRequest::Metrics.prepend_mod_with('MergeRequest::Metrics')
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index 25ee3fb7e83..a3c4f3573d6 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -783,4 +783,4 @@ class MergeRequestDiff < ApplicationRecord
end
end
-MergeRequestDiff.prepend_if_ee('EE::MergeRequestDiff')
+MergeRequestDiff.prepend_mod_with('MergeRequestDiff')
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 0999ee5fd15..16090f0ebfa 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -7,7 +7,7 @@ class Milestone < ApplicationRecord
include FromUnion
include Importable
- prepend_if_ee('::EE::Milestone') # rubocop: disable Cop/InjectEnterpriseEditionModule
+ prepend_mod_with('Milestone') # rubocop: disable Cop/InjectEnterpriseEditionModule
class Predefined
ALL = [::Timebox::None, ::Timebox::Any, ::Timebox::Started, ::Timebox::Upcoming].freeze
diff --git a/app/models/milestone_release.rb b/app/models/milestone_release.rb
index c6b5a967af9..93ad961ca51 100644
--- a/app/models/milestone_release.rb
+++ b/app/models/milestone_release.rb
@@ -19,4 +19,4 @@ class MilestoneRelease < ApplicationRecord
end
end
-MilestoneRelease.prepend_if_ee('EE::MilestoneRelease')
+MilestoneRelease.prepend_mod_with('MilestoneRelease')
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 8777d0081cc..86659511d83 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -490,4 +490,4 @@ class Namespace < ApplicationRecord
end
end
-Namespace.prepend_if_ee('EE::Namespace')
+Namespace.prepend_mod_with('Namespace')
diff --git a/app/models/namespace/root_storage_statistics.rb b/app/models/namespace/root_storage_statistics.rb
index 0c91ae760b2..73061b78637 100644
--- a/app/models/namespace/root_storage_statistics.rb
+++ b/app/models/namespace/root_storage_statistics.rb
@@ -70,4 +70,4 @@ class Namespace::RootStorageStatistics < ApplicationRecord
end
end
-Namespace::RootStorageStatistics.prepend_if_ee('EE::Namespace::RootStorageStatistics')
+Namespace::RootStorageStatistics.prepend_mod_with('Namespace::RootStorageStatistics')
diff --git a/app/models/namespace_setting.rb b/app/models/namespace_setting.rb
index d21f9632e18..75b8169b58e 100644
--- a/app/models/namespace_setting.rb
+++ b/app/models/namespace_setting.rb
@@ -45,4 +45,4 @@ class NamespaceSetting < ApplicationRecord
end
end
-NamespaceSetting.prepend_if_ee('EE::NamespaceSetting')
+NamespaceSetting.prepend_mod_with('NamespaceSetting')
diff --git a/app/models/note.rb b/app/models/note.rb
index 346b32ae510..ae4a8859d4d 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -639,4 +639,4 @@ class Note < ApplicationRecord
end
end
-Note.prepend_if_ee('EE::Note')
+Note.prepend_mod_with('Note')
diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb
index 3d049336d44..4323f89865a 100644
--- a/app/models/notification_setting.rb
+++ b/app/models/notification_setting.rb
@@ -118,4 +118,4 @@ class NotificationSetting < ApplicationRecord
end
end
-NotificationSetting.prepend_if_ee('EE::NotificationSetting')
+NotificationSetting.prepend_mod_with('NotificationSetting')
diff --git a/app/models/packages/package_file.rb b/app/models/packages/package_file.rb
index dbd25de12ea..3d8641ca2fa 100644
--- a/app/models/packages/package_file.rb
+++ b/app/models/packages/package_file.rb
@@ -80,4 +80,4 @@ class Packages::PackageFile < ApplicationRecord
end
end
-Packages::PackageFile.prepend_if_ee('EE::Packages::PackageFile')
+Packages::PackageFile.prepend_mod_with('Packages::PackageFile')
diff --git a/app/models/pages_domain.rb b/app/models/pages_domain.rb
index 4d60489e599..4668fc265a0 100644
--- a/app/models/pages_domain.rb
+++ b/app/models/pages_domain.rb
@@ -311,4 +311,4 @@ class PagesDomain < ApplicationRecord
end
end
-PagesDomain.prepend_if_ee('::EE::PagesDomain')
+PagesDomain.prepend_mod_with('PagesDomain')
diff --git a/app/models/personal_access_token.rb b/app/models/personal_access_token.rb
index 6a786f75ec1..732ed0b7bb3 100644
--- a/app/models/personal_access_token.rb
+++ b/app/models/personal_access_token.rb
@@ -110,4 +110,4 @@ class PersonalAccessToken < ApplicationRecord
end
end
-PersonalAccessToken.prepend_if_ee('EE::PersonalAccessToken')
+PersonalAccessToken.prepend_mod_with('PersonalAccessToken')
diff --git a/app/models/plan.rb b/app/models/plan.rb
index 6a7f32a5d5f..f3ef04315f8 100644
--- a/app/models/plan.rb
+++ b/app/models/plan.rb
@@ -39,4 +39,4 @@ class Plan < ApplicationRecord
end
end
-Plan.prepend_if_ee('EE::Plan')
+Plan.prepend_mod_with('Plan')
diff --git a/app/models/pool_repository.rb b/app/models/pool_repository.rb
index 94992adfd1e..78cddaa1302 100644
--- a/app/models/pool_repository.rb
+++ b/app/models/pool_repository.rb
@@ -115,4 +115,4 @@ class PoolRepository < ApplicationRecord
end
end
-PoolRepository.prepend_if_ee('EE::PoolRepository')
+PoolRepository.prepend_mod_with('PoolRepository')
diff --git a/app/models/preloaders/labels_preloader.rb b/app/models/preloaders/labels_preloader.rb
index 427f2869aac..bb3206f5399 100644
--- a/app/models/preloaders/labels_preloader.rb
+++ b/app/models/preloaders/labels_preloader.rb
@@ -31,4 +31,4 @@ module Preloaders
end
end
-Preloaders::LabelsPreloader.prepend_if_ee('EE::Preloaders::LabelsPreloader')
+Preloaders::LabelsPreloader.prepend_mod_with('Preloaders::LabelsPreloader')
diff --git a/app/models/project.rb b/app/models/project.rb
index af7ddccf5e1..4a42ba53e5d 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -2764,4 +2764,4 @@ class Project < ApplicationRecord
end
end
-Project.prepend_if_ee('EE::Project')
+Project.prepend_mod_with('Project')
diff --git a/app/models/project_authorization.rb b/app/models/project_authorization.rb
index 2c3f70654f8..1fed166e4d0 100644
--- a/app/models/project_authorization.rb
+++ b/app/models/project_authorization.rb
@@ -31,4 +31,4 @@ class ProjectAuthorization < ApplicationRecord
end
end
-ProjectAuthorization.prepend_if_ee('::EE::ProjectAuthorization')
+ProjectAuthorization.prepend_mod_with('ProjectAuthorization')
diff --git a/app/models/project_ci_cd_setting.rb b/app/models/project_ci_cd_setting.rb
index 31be0759cd0..c0c2ea42d46 100644
--- a/app/models/project_ci_cd_setting.rb
+++ b/app/models/project_ci_cd_setting.rb
@@ -33,4 +33,4 @@ class ProjectCiCdSetting < ApplicationRecord
end
end
-ProjectCiCdSetting.prepend_if_ee('EE::ProjectCiCdSetting')
+ProjectCiCdSetting.prepend_mod_with('ProjectCiCdSetting')
diff --git a/app/models/project_feature.rb b/app/models/project_feature.rb
index 15f6bedfc2e..eb4ad327438 100644
--- a/app/models/project_feature.rb
+++ b/app/models/project_feature.rb
@@ -145,4 +145,4 @@ class ProjectFeature < ApplicationRecord
end
end
-ProjectFeature.prepend_if_ee('EE::ProjectFeature')
+ProjectFeature.prepend_mod_with('ProjectFeature')
diff --git a/app/models/project_feature_usage.rb b/app/models/project_feature_usage.rb
index 02051310af7..d993db860c3 100644
--- a/app/models/project_feature_usage.rb
+++ b/app/models/project_feature_usage.rb
@@ -45,4 +45,4 @@ class ProjectFeatureUsage < ApplicationRecord
end
end
-ProjectFeatureUsage.prepend_if_ee('EE::ProjectFeatureUsage')
+ProjectFeatureUsage.prepend_mod_with('ProjectFeatureUsage')
diff --git a/app/models/project_group_link.rb b/app/models/project_group_link.rb
index f065246e8af..ec4aea18486 100644
--- a/app/models/project_group_link.rb
+++ b/app/models/project_group_link.rb
@@ -49,4 +49,4 @@ class ProjectGroupLink < ApplicationRecord
end
end
-ProjectGroupLink.prepend_if_ee('EE::ProjectGroupLink')
+ProjectGroupLink.prepend_mod_with('ProjectGroupLink')
diff --git a/app/models/project_import_data.rb b/app/models/project_import_data.rb
index 87ac6d38787..d374ee120d1 100644
--- a/app/models/project_import_data.rb
+++ b/app/models/project_import_data.rb
@@ -3,7 +3,7 @@
require 'carrierwave/orm/activerecord'
class ProjectImportData < ApplicationRecord
- prepend_if_ee('::EE::ProjectImportData') # rubocop: disable Cop/InjectEnterpriseEditionModule
+ prepend_mod_with('ProjectImportData') # rubocop: disable Cop/InjectEnterpriseEditionModule
belongs_to :project, inverse_of: :import_data
attr_encrypted :credentials,
diff --git a/app/models/project_import_state.rb b/app/models/project_import_state.rb
index 4bd3ffbea2f..633e669b5fc 100644
--- a/app/models/project_import_state.rb
+++ b/app/models/project_import_state.rb
@@ -105,4 +105,4 @@ class ProjectImportState < ApplicationRecord
end
end
-ProjectImportState.prepend_if_ee('EE::ProjectImportState')
+ProjectImportState.prepend_mod_with('ProjectImportState')
diff --git a/app/models/project_services/issue_tracker_service.rb b/app/models/project_services/issue_tracker_service.rb
index 46aad221597..c2282c9b800 100644
--- a/app/models/project_services/issue_tracker_service.rb
+++ b/app/models/project_services/issue_tracker_service.rb
@@ -149,4 +149,4 @@ class IssueTrackerService < Service
end
end
-IssueTrackerService.prepend_if_ee('EE::IssueTrackerService')
+IssueTrackerService.prepend_mod_with('IssueTrackerService')
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index f1db78501d5..5cd6e79eb1d 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -538,4 +538,4 @@ class JiraService < IssueTrackerService
end
end
-JiraService.prepend_if_ee('EE::JiraService')
+JiraService.prepend_mod_with('JiraService')
diff --git a/app/models/project_setting.rb b/app/models/project_setting.rb
index 83ff0702b88..24d892290a6 100644
--- a/app/models/project_setting.rb
+++ b/app/models/project_setting.rb
@@ -21,4 +21,4 @@ class ProjectSetting < ApplicationRecord
end
end
-ProjectSetting.prepend_ee_mod
+ProjectSetting.prepend_mod
diff --git a/app/models/project_statistics.rb b/app/models/project_statistics.rb
index 8c3dcaa7c0f..37ddd2d030d 100644
--- a/app/models/project_statistics.rb
+++ b/app/models/project_statistics.rb
@@ -159,4 +159,4 @@ class ProjectStatistics < ApplicationRecord
end
end
-ProjectStatistics.prepend_if_ee('EE::ProjectStatistics')
+ProjectStatistics.prepend_mod_with('ProjectStatistics')
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index fa99e2cb1a7..a85afada901 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -234,4 +234,4 @@ class ProjectTeam
end
end
-ProjectTeam.prepend_if_ee('EE::ProjectTeam')
+ProjectTeam.prepend_mod_with('ProjectTeam')
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index 91fb3d4e4ba..ffffa803011 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -32,4 +32,4 @@ end
# TODO: Remove this once we implement ES support for group wikis.
# https://gitlab.com/gitlab-org/gitlab/-/issues/207889
-ProjectWiki.prepend_if_ee('EE::ProjectWiki')
+ProjectWiki.prepend_mod_with('ProjectWiki')
diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb
index 963a6b7774a..889eaed138d 100644
--- a/app/models/protected_branch.rb
+++ b/app/models/protected_branch.rb
@@ -63,4 +63,4 @@ class ProtectedBranch < ApplicationRecord
end
end
-ProtectedBranch.prepend_if_ee('EE::ProtectedBranch')
+ProtectedBranch.prepend_mod_with('ProtectedBranch')
diff --git a/app/models/push_event_payload.rb b/app/models/push_event_payload.rb
index 2786ecb641a..8358be35470 100644
--- a/app/models/push_event_payload.rb
+++ b/app/models/push_event_payload.rb
@@ -25,4 +25,4 @@ class PushEventPayload < ApplicationRecord
}
end
-PushEventPayload.prepend_if_ee('EE::PushEventPayload')
+PushEventPayload.prepend_mod_with('PushEventPayload')
diff --git a/app/models/release.rb b/app/models/release.rb
index cf90b07c2a5..1889a0707b4 100644
--- a/app/models/release.rb
+++ b/app/models/release.rb
@@ -128,4 +128,4 @@ class Release < ApplicationRecord
end
end
-Release.prepend_if_ee('EE::Release')
+Release.prepend_mod_with('Release')
diff --git a/app/models/remote_mirror.rb b/app/models/remote_mirror.rb
index 1ba69aa9e4d..c3ca90ca0ad 100644
--- a/app/models/remote_mirror.rb
+++ b/app/models/remote_mirror.rb
@@ -339,4 +339,4 @@ class RemoteMirror < ApplicationRecord
end
end
-RemoteMirror.prepend_if_ee('EE::RemoteMirror')
+RemoteMirror.prepend_mod_with('RemoteMirror')
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 9411cbc35fc..7dca8e52403 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -1193,4 +1193,4 @@ class Repository
end
end
-Repository.prepend_if_ee('EE::Repository')
+Repository.prepend_mod_with('Repository')
diff --git a/app/models/resource_label_event.rb b/app/models/resource_label_event.rb
index 57a3b568c53..68f0ab06bea 100644
--- a/app/models/resource_label_event.rb
+++ b/app/models/resource_label_event.rb
@@ -115,4 +115,4 @@ class ResourceLabelEvent < ResourceEvent
end
end
-ResourceLabelEvent.prepend_if_ee('EE::ResourceLabelEvent')
+ResourceLabelEvent.prepend_mod_with('ResourceLabelEvent')
diff --git a/app/models/resource_state_event.rb b/app/models/resource_state_event.rb
index 73eb4987143..689a9d8a8ae 100644
--- a/app/models/resource_state_event.rb
+++ b/app/models/resource_state_event.rb
@@ -45,4 +45,4 @@ class ResourceStateEvent < ResourceEvent
end
end
-ResourceStateEvent.prepend_if_ee('EE::ResourceStateEvent')
+ResourceStateEvent.prepend_mod_with('ResourceStateEvent')
diff --git a/app/models/resource_timebox_event.rb b/app/models/resource_timebox_event.rb
index 71077758b69..db87ff09159 100644
--- a/app/models/resource_timebox_event.rb
+++ b/app/models/resource_timebox_event.rb
@@ -41,4 +41,4 @@ class ResourceTimeboxEvent < ResourceEvent
end
end
-ResourceTimeboxEvent.prepend_if_ee('EE::ResourceTimeboxEvent')
+ResourceTimeboxEvent.prepend_mod_with('ResourceTimeboxEvent')
diff --git a/app/models/service.rb b/app/models/service.rb
index 940caee8d65..5e8582ab8e7 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -510,4 +510,4 @@ class Service < ApplicationRecord
end
end
-Service.prepend_if_ee('EE::Service')
+Service.prepend_mod_with('Service')
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index fb3c190a637..4f64c074856 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -391,4 +391,4 @@ class Snippet < ApplicationRecord
end
end
-Snippet.prepend_if_ee('EE::Snippet')
+Snippet.prepend_mod_with('Snippet')
diff --git a/app/models/snippet_repository.rb b/app/models/snippet_repository.rb
index 54dbc579d54..92405a0d943 100644
--- a/app/models/snippet_repository.rb
+++ b/app/models/snippet_repository.rb
@@ -133,4 +133,4 @@ class SnippetRepository < ApplicationRecord
end
end
-SnippetRepository.prepend_if_ee('EE::SnippetRepository')
+SnippetRepository.prepend_mod_with('SnippetRepository')
diff --git a/app/models/system_note_metadata.rb b/app/models/system_note_metadata.rb
index 20107147b4f..749b9dce97c 100644
--- a/app/models/system_note_metadata.rb
+++ b/app/models/system_note_metadata.rb
@@ -41,4 +41,4 @@ class SystemNoteMetadata < ApplicationRecord
end
end
-SystemNoteMetadata.prepend_if_ee('EE::SystemNoteMetadata')
+SystemNoteMetadata.prepend_mod_with('SystemNoteMetadata')
diff --git a/app/models/terraform/state.rb b/app/models/terraform/state.rb
index 88dde62d4f2..8aeeae1330c 100644
--- a/app/models/terraform/state.rb
+++ b/app/models/terraform/state.rb
@@ -105,4 +105,4 @@ module Terraform
end
end
-Terraform::State.prepend_if_ee('EE::Terraform::State')
+Terraform::State.prepend_mod
diff --git a/app/models/terraform/state_version.rb b/app/models/terraform/state_version.rb
index 432ac5b6422..31ff7e4c27d 100644
--- a/app/models/terraform/state_version.rb
+++ b/app/models/terraform/state_version.rb
@@ -20,4 +20,4 @@ module Terraform
end
end
-Terraform::StateVersion.prepend_if_ee('EE::Terraform::StateVersion')
+Terraform::StateVersion.prepend_mod_with('Terraform::StateVersion')
diff --git a/app/models/todo.rb b/app/models/todo.rb
index 8171b497e45..23685fb68e0 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -252,4 +252,4 @@ class Todo < ApplicationRecord
end
end
-Todo.prepend_if_ee('EE::Todo')
+Todo.prepend_mod_with('Todo')
diff --git a/app/models/upload.rb b/app/models/upload.rb
index 46ae924bf8c..0a4acdfc7e3 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -163,4 +163,4 @@ class Upload < ApplicationRecord
end
end
-Upload.prepend_if_ee('EE::Upload')
+Upload.prepend_mod_with('Upload')
diff --git a/app/models/user.rb b/app/models/user.rb
index c7ad4dcff8a..4b38ef771a1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2079,4 +2079,4 @@ class User < ApplicationRecord
end
end
-User.prepend_if_ee('EE::User')
+User.prepend_mod_with('User')
diff --git a/app/models/user_detail.rb b/app/models/user_detail.rb
index 6b64f583927..458764632ed 100644
--- a/app/models/user_detail.rb
+++ b/app/models/user_detail.rb
@@ -32,4 +32,4 @@ class UserDetail < ApplicationRecord
end
end
-UserDetail.prepend_if_ee('EE::UserDetail')
+UserDetail.prepend_mod_with('UserDetail')
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 0bf8c8f901d..2735e169b5f 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -71,4 +71,4 @@ class UserPreference < ApplicationRecord
end
end
-UserPreference.prepend_if_ee('EE::UserPreference')
+UserPreference.prepend_mod_with('UserPreference')
diff --git a/app/models/users/merge_request_interaction.rb b/app/models/users/merge_request_interaction.rb
index 35d1d3206b5..4af9361fbf6 100644
--- a/app/models/users/merge_request_interaction.rb
+++ b/app/models/users/merge_request_interaction.rb
@@ -41,4 +41,4 @@ module Users
end
end
-::Users::MergeRequestInteraction.prepend_if_ee('EE::Users::MergeRequestInteraction')
+::Users::MergeRequestInteraction.prepend_mod_with('Users::MergeRequestInteraction')
diff --git a/app/models/users_statistics.rb b/app/models/users_statistics.rb
index d724b06a996..a903541f69a 100644
--- a/app/models/users_statistics.rb
+++ b/app/models/users_statistics.rb
@@ -71,4 +71,4 @@ class UsersStatistics < ApplicationRecord
end
end
-UsersStatistics.prepend_if_ee('EE::UsersStatistics')
+UsersStatistics.prepend_mod_with('UsersStatistics')
diff --git a/app/models/vulnerability.rb b/app/models/vulnerability.rb
index 7728c9c174e..4e1f48227d9 100644
--- a/app/models/vulnerability.rb
+++ b/app/models/vulnerability.rb
@@ -17,4 +17,4 @@ class Vulnerability < ApplicationRecord
end
end
-Vulnerability.prepend_ee_mod
+Vulnerability.prepend_mod
diff --git a/app/models/wiki.rb b/app/models/wiki.rb
index 40527800783..7fc01f373c8 100644
--- a/app/models/wiki.rb
+++ b/app/models/wiki.rb
@@ -320,4 +320,4 @@ class Wiki
end
end
-Wiki.prepend_if_ee('EE::Wiki')
+Wiki.prepend_mod_with('Wiki')
diff --git a/app/policies/base_policy.rb b/app/policies/base_policy.rb
index 4644adad469..0f7a6b852ab 100644
--- a/app/policies/base_policy.rb
+++ b/app/policies/base_policy.rb
@@ -66,4 +66,4 @@ class BasePolicy < DeclarativePolicy::Base
condition(:is_gitlab_com) { ::Gitlab.dev_env_or_com? }
end
-BasePolicy.prepend_if_ee('EE::BasePolicy')
+BasePolicy.prepend_mod_with('BasePolicy')
diff --git a/app/policies/ci/build_policy.rb b/app/policies/ci/build_policy.rb
index 65f2a70672b..3e41b2a139f 100644
--- a/app/policies/ci/build_policy.rb
+++ b/app/policies/ci/build_policy.rb
@@ -108,4 +108,4 @@ module Ci
end
end
-Ci::BuildPolicy.prepend_if_ee('EE::Ci::BuildPolicy')
+Ci::BuildPolicy.prepend_mod_with('Ci::BuildPolicy')
diff --git a/app/policies/clusters/instance_policy.rb b/app/policies/clusters/instance_policy.rb
index d8e8f9ff2c1..3c5ca4bf4e1 100644
--- a/app/policies/clusters/instance_policy.rb
+++ b/app/policies/clusters/instance_policy.rb
@@ -13,4 +13,4 @@ module Clusters
end
end
-Clusters::InstancePolicy.prepend_if_ee('EE::Clusters::InstancePolicy')
+Clusters::InstancePolicy.prepend_mod_with('Clusters::InstancePolicy')
diff --git a/app/policies/concerns/policy_actor.rb b/app/policies/concerns/policy_actor.rb
index 75849fb10c8..cd19b46ad6c 100644
--- a/app/policies/concerns/policy_actor.rb
+++ b/app/policies/concerns/policy_actor.rb
@@ -82,4 +82,4 @@ module PolicyActor
end
end
-PolicyActor.prepend_if_ee('EE::PolicyActor')
+PolicyActor.prepend_mod_with('PolicyActor')
diff --git a/app/policies/concerns/readonly_abilities.rb b/app/policies/concerns/readonly_abilities.rb
index 0303d4cff14..723bbe37769 100644
--- a/app/policies/concerns/readonly_abilities.rb
+++ b/app/policies/concerns/readonly_abilities.rb
@@ -49,4 +49,4 @@ module ReadonlyAbilities
end
end
-ReadonlyAbilities::ClassMethods.prepend_if_ee('EE::ReadonlyAbilities::ClassMethods')
+ReadonlyAbilities::ClassMethods.prepend_mod_with('ReadonlyAbilities::ClassMethods')
diff --git a/app/policies/environment_policy.rb b/app/policies/environment_policy.rb
index f0187a39687..e9e3517b3da 100644
--- a/app/policies/environment_policy.rb
+++ b/app/policies/environment_policy.rb
@@ -21,4 +21,4 @@ class EnvironmentPolicy < BasePolicy
rule { ~stopped }.prevent(:destroy_environment)
end
-EnvironmentPolicy.prepend_if_ee('EE::EnvironmentPolicy')
+EnvironmentPolicy.prepend_mod_with('EnvironmentPolicy')
diff --git a/app/policies/global_policy.rb b/app/policies/global_policy.rb
index d16c4734b2c..85263ec7c87 100644
--- a/app/policies/global_policy.rb
+++ b/app/policies/global_policy.rb
@@ -113,4 +113,4 @@ class GlobalPolicy < BasePolicy
rule { external_user }.prevent :create_snippet
end
-GlobalPolicy.prepend_if_ee('EE::GlobalPolicy')
+GlobalPolicy.prepend_mod_with('GlobalPolicy')
diff --git a/app/policies/group_member_policy.rb b/app/policies/group_member_policy.rb
index 8a4cae232a0..f7a7286aba7 100644
--- a/app/policies/group_member_policy.rb
+++ b/app/policies/group_member_policy.rb
@@ -30,4 +30,4 @@ class GroupMemberPolicy < BasePolicy
end
end
-GroupMemberPolicy.prepend_if_ee('EE::GroupMemberPolicy')
+GroupMemberPolicy.prepend_mod_with('GroupMemberPolicy')
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb
index fc24525ade7..821fabec266 100644
--- a/app/policies/group_policy.rb
+++ b/app/policies/group_policy.rb
@@ -258,4 +258,4 @@ class GroupPolicy < BasePolicy
end
end
-GroupPolicy.prepend_if_ee('EE::GroupPolicy')
+GroupPolicy.prepend_mod_with('GroupPolicy')
diff --git a/app/policies/identity_provider_policy.rb b/app/policies/identity_provider_policy.rb
index 6d6dcaebff8..c539fc64d3f 100644
--- a/app/policies/identity_provider_policy.rb
+++ b/app/policies/identity_provider_policy.rb
@@ -14,4 +14,4 @@ class IdentityProviderPolicy < BasePolicy
rule { protected_provider }.prevent(:unlink)
end
-IdentityProviderPolicy.prepend_if_ee('EE::IdentityProviderPolicy')
+IdentityProviderPolicy.prepend_mod_with('IdentityProviderPolicy')
diff --git a/app/policies/issuable_policy.rb b/app/policies/issuable_policy.rb
index f49a6ee8498..61263e47d7c 100644
--- a/app/policies/issuable_policy.rb
+++ b/app/policies/issuable_policy.rb
@@ -28,4 +28,4 @@ class IssuablePolicy < BasePolicy
end
end
-IssuablePolicy.prepend_if_ee('EE::IssuablePolicy')
+IssuablePolicy.prepend_mod_with('IssuablePolicy')
diff --git a/app/policies/issue_policy.rb b/app/policies/issue_policy.rb
index 183f4d8f919..6eec03d6d75 100644
--- a/app/policies/issue_policy.rb
+++ b/app/policies/issue_policy.rb
@@ -41,4 +41,4 @@ class IssuePolicy < IssuablePolicy
end
end
-IssuePolicy.prepend_if_ee('EE::IssuePolicy')
+IssuePolicy.prepend_mod_with('IssuePolicy')
diff --git a/app/policies/merge_request_policy.rb b/app/policies/merge_request_policy.rb
index e3fb54172f8..e53a916f3ca 100644
--- a/app/policies/merge_request_policy.rb
+++ b/app/policies/merge_request_policy.rb
@@ -29,4 +29,4 @@ class MergeRequestPolicy < IssuablePolicy
end
end
-MergeRequestPolicy.prepend_if_ee('EE::MergeRequestPolicy')
+MergeRequestPolicy.prepend_mod_with('MergeRequestPolicy')
diff --git a/app/policies/namespace_policy.rb b/app/policies/namespace_policy.rb
index 13eb4a13cac..dcbeda9f5d3 100644
--- a/app/policies/namespace_policy.rb
+++ b/app/policies/namespace_policy.rb
@@ -23,4 +23,4 @@ class NamespacePolicy < BasePolicy
rule { (owner | admin) & can?(:create_projects) }.enable :transfer_projects
end
-NamespacePolicy.prepend_if_ee('EE::NamespacePolicy')
+NamespacePolicy.prepend_mod_with('NamespacePolicy')
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index c577c8c8471..5b4160c211a 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -745,4 +745,4 @@ class ProjectPolicy < BasePolicy
end
end
-ProjectPolicy.prepend_if_ee('EE::ProjectPolicy')
+ProjectPolicy.prepend_mod_with('ProjectPolicy')
diff --git a/app/policies/project_snippet_policy.rb b/app/policies/project_snippet_policy.rb
index 869f4716298..b8f0be9b4c5 100644
--- a/app/policies/project_snippet_policy.rb
+++ b/app/policies/project_snippet_policy.rb
@@ -51,4 +51,4 @@ class ProjectSnippetPolicy < BasePolicy
rule { ~can?(:read_snippet) }.prevent :create_note
end
-ProjectSnippetPolicy.prepend_if_ee('EE::ProjectSnippetPolicy')
+ProjectSnippetPolicy.prepend_mod_with('ProjectSnippetPolicy')
diff --git a/app/policies/protected_branch_policy.rb b/app/policies/protected_branch_policy.rb
index 1a5c6528b82..8ad06653e5c 100644
--- a/app/policies/protected_branch_policy.rb
+++ b/app/policies/protected_branch_policy.rb
@@ -10,4 +10,4 @@ class ProtectedBranchPolicy < BasePolicy
end
end
-ProtectedBranchPolicy.prepend_if_ee('EE::ProtectedBranchPolicy')
+ProtectedBranchPolicy.prepend_mod_with('ProtectedBranchPolicy')
diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb
index 48c2bd3f0bd..067f0f6a9d2 100644
--- a/app/policies/user_policy.rb
+++ b/app/policies/user_policy.rb
@@ -33,4 +33,4 @@ class UserPolicy < BasePolicy
rule { (user_is_self | admin) & ~blocked }.enable :create_user_personal_access_token
end
-UserPolicy.prepend_if_ee('EE::UserPolicy')
+UserPolicy.prepend_mod_with('UserPolicy')
diff --git a/app/presenters/alert_management/alert_presenter.rb b/app/presenters/alert_management/alert_presenter.rb
index 2cfba937f91..c6c6fe837a0 100644
--- a/app/presenters/alert_management/alert_presenter.rb
+++ b/app/presenters/alert_management/alert_presenter.rb
@@ -113,4 +113,4 @@ module AlertManagement
end
end
-AlertManagement::AlertPresenter.prepend_if_ee('EE::AlertManagement::AlertPresenter')
+AlertManagement::AlertPresenter.prepend_mod_with('AlertManagement::AlertPresenter')
diff --git a/app/presenters/ci/build_presenter.rb b/app/presenters/ci/build_presenter.rb
index 51a81158f78..384cb3285fc 100644
--- a/app/presenters/ci/build_presenter.rb
+++ b/app/presenters/ci/build_presenter.rb
@@ -51,4 +51,4 @@ module Ci
end
end
-Ci::BuildPresenter.prepend_if_ee('EE::Ci::BuildPresenter')
+Ci::BuildPresenter.prepend_mod_with('Ci::BuildPresenter')
diff --git a/app/presenters/ci/build_runner_presenter.rb b/app/presenters/ci/build_runner_presenter.rb
index 6978bc46475..5b233ad89ec 100644
--- a/app/presenters/ci/build_runner_presenter.rb
+++ b/app/presenters/ci/build_runner_presenter.rb
@@ -138,4 +138,4 @@ module Ci
end
end
-Ci::BuildRunnerPresenter.prepend_if_ee('EE::Ci::BuildRunnerPresenter')
+Ci::BuildRunnerPresenter.prepend_mod_with('Ci::BuildRunnerPresenter')
diff --git a/app/presenters/ci/pipeline_presenter.rb b/app/presenters/ci/pipeline_presenter.rb
index c3ba9439e96..82f00f74692 100644
--- a/app/presenters/ci/pipeline_presenter.rb
+++ b/app/presenters/ci/pipeline_presenter.rb
@@ -164,4 +164,4 @@ module Ci
end
end
-Ci::PipelinePresenter.prepend_if_ee('EE::Ci::PipelinePresenter')
+Ci::PipelinePresenter.prepend_mod_with('Ci::PipelinePresenter')
diff --git a/app/presenters/clusterable_presenter.rb b/app/presenters/clusterable_presenter.rb
index 62488465c24..a316793dae9 100644
--- a/app/presenters/clusterable_presenter.rb
+++ b/app/presenters/clusterable_presenter.rb
@@ -86,4 +86,4 @@ class ClusterablePresenter < Gitlab::View::Presenter::Delegated
end
end
-ClusterablePresenter.prepend_if_ee('EE::ClusterablePresenter')
+ClusterablePresenter.prepend_mod_with('ClusterablePresenter')
diff --git a/app/presenters/clusters/cluster_presenter.rb b/app/presenters/clusters/cluster_presenter.rb
index 038fc752255..02049adfe52 100644
--- a/app/presenters/clusters/cluster_presenter.rb
+++ b/app/presenters/clusters/cluster_presenter.rb
@@ -144,4 +144,4 @@ module Clusters
end
end
-Clusters::ClusterPresenter.prepend_if_ee('EE::Clusters::ClusterPresenter')
+Clusters::ClusterPresenter.prepend_mod_with('Clusters::ClusterPresenter')
diff --git a/app/presenters/commit_status_presenter.rb b/app/presenters/commit_status_presenter.rb
index 7b639c709e1..6b783226beb 100644
--- a/app/presenters/commit_status_presenter.rb
+++ b/app/presenters/commit_status_presenter.rb
@@ -40,4 +40,4 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated
end
end
-CommitStatusPresenter.prepend_if_ee('::EE::CommitStatusPresenter')
+CommitStatusPresenter.prepend_mod_with('CommitStatusPresenter')
diff --git a/app/presenters/group_clusterable_presenter.rb b/app/presenters/group_clusterable_presenter.rb
index dfe8e315f94..adbe20517be 100644
--- a/app/presenters/group_clusterable_presenter.rb
+++ b/app/presenters/group_clusterable_presenter.rb
@@ -49,4 +49,4 @@ class GroupClusterablePresenter < ClusterablePresenter
end
end
-GroupClusterablePresenter.prepend_if_ee('EE::GroupClusterablePresenter')
+GroupClusterablePresenter.prepend_mod_with('GroupClusterablePresenter')
diff --git a/app/presenters/group_member_presenter.rb b/app/presenters/group_member_presenter.rb
index df51f1eb075..5ab4b51f472 100644
--- a/app/presenters/group_member_presenter.rb
+++ b/app/presenters/group_member_presenter.rb
@@ -16,4 +16,4 @@ class GroupMemberPresenter < MemberPresenter
end
end
-GroupMemberPresenter.prepend_if_ee('EE::GroupMemberPresenter')
+GroupMemberPresenter.prepend_mod_with('GroupMemberPresenter')
diff --git a/app/presenters/instance_clusterable_presenter.rb b/app/presenters/instance_clusterable_presenter.rb
index 94c1195ed6a..84b3328b37f 100644
--- a/app/presenters/instance_clusterable_presenter.rb
+++ b/app/presenters/instance_clusterable_presenter.rb
@@ -87,4 +87,4 @@ class InstanceClusterablePresenter < ClusterablePresenter
end
end
-InstanceClusterablePresenter.prepend_if_ee('EE::InstanceClusterablePresenter')
+InstanceClusterablePresenter.prepend_mod_with('InstanceClusterablePresenter')
diff --git a/app/presenters/issue_presenter.rb b/app/presenters/issue_presenter.rb
index 76bf3bf4577..b7f4ac0555d 100644
--- a/app/presenters/issue_presenter.rb
+++ b/app/presenters/issue_presenter.rb
@@ -16,4 +16,4 @@ class IssuePresenter < Gitlab::View::Presenter::Delegated
end
end
-IssuePresenter.prepend_if_ee('EE::IssuePresenter')
+IssuePresenter.prepend_mod_with('IssuePresenter')
diff --git a/app/presenters/label_presenter.rb b/app/presenters/label_presenter.rb
index c23d6ce2218..9e51e6fa4ba 100644
--- a/app/presenters/label_presenter.rb
+++ b/app/presenters/label_presenter.rb
@@ -51,4 +51,4 @@ class LabelPresenter < Gitlab::View::Presenter::Delegated
end
end
-LabelPresenter.prepend_if_ee('EE::LabelPresenter')
+LabelPresenter.prepend_mod_with('LabelPresenter')
diff --git a/app/presenters/member_presenter.rb b/app/presenters/member_presenter.rb
index 0c67fc98ced..b37a43bf251 100644
--- a/app/presenters/member_presenter.rb
+++ b/app/presenters/member_presenter.rb
@@ -52,4 +52,4 @@ class MemberPresenter < Gitlab::View::Presenter::Delegated
end
end
-MemberPresenter.prepend_if_ee('EE::MemberPresenter')
+MemberPresenter.prepend_mod_with('MemberPresenter')
diff --git a/app/presenters/merge_request_presenter.rb b/app/presenters/merge_request_presenter.rb
index a22138011ae..f03ea5d129a 100644
--- a/app/presenters/merge_request_presenter.rb
+++ b/app/presenters/merge_request_presenter.rb
@@ -273,4 +273,4 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
end
end
-MergeRequestPresenter.prepend_if_ee('EE::MergeRequestPresenter')
+MergeRequestPresenter.prepend_mod_with('MergeRequestPresenter')
diff --git a/app/presenters/project_clusterable_presenter.rb b/app/presenters/project_clusterable_presenter.rb
index 718f653eab1..1c5f11ffe59 100644
--- a/app/presenters/project_clusterable_presenter.rb
+++ b/app/presenters/project_clusterable_presenter.rb
@@ -44,4 +44,4 @@ class ProjectClusterablePresenter < ClusterablePresenter
end
end
-ProjectClusterablePresenter.prepend_if_ee('EE::ProjectClusterablePresenter')
+ProjectClusterablePresenter.prepend_mod_with('ProjectClusterablePresenter')
diff --git a/app/presenters/project_member_presenter.rb b/app/presenters/project_member_presenter.rb
index ff9c3df793a..17947266ed7 100644
--- a/app/presenters/project_member_presenter.rb
+++ b/app/presenters/project_member_presenter.rb
@@ -16,4 +16,4 @@ class ProjectMemberPresenter < MemberPresenter
end
end
-ProjectMemberPresenter.prepend_if_ee('EE::ProjectMemberPresenter')
+ProjectMemberPresenter.prepend_mod_with('ProjectMemberPresenter')
diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb
index a03137cd0d9..5dcdfb8d653 100644
--- a/app/presenters/project_presenter.rb
+++ b/app/presenters/project_presenter.rb
@@ -480,4 +480,4 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
end
end
-ProjectPresenter.prepend_if_ee('EE::ProjectPresenter')
+ProjectPresenter.prepend_mod_with('ProjectPresenter')
diff --git a/app/serializers/admin/user_entity.rb b/app/serializers/admin/user_entity.rb
index a5cf40a50b9..8fab1fa3a3e 100644
--- a/app/serializers/admin/user_entity.rb
+++ b/app/serializers/admin/user_entity.rb
@@ -31,4 +31,4 @@ module Admin
end
end
-Admin::UserEntity.prepend_if_ee('EE::Admin::UserEntity')
+Admin::UserEntity.prepend_mod_with('Admin::UserEntity')
diff --git a/app/serializers/blob_entity.rb b/app/serializers/blob_entity.rb
index a54af899ba2..6dde35a9415 100644
--- a/app/serializers/blob_entity.rb
+++ b/app/serializers/blob_entity.rb
@@ -16,4 +16,4 @@ class BlobEntity < Grape::Entity
end
end
-BlobEntity.prepend_if_ee('EE::BlobEntity')
+BlobEntity.prepend_mod_with('BlobEntity')
diff --git a/app/serializers/board_simple_entity.rb b/app/serializers/board_simple_entity.rb
index a3c16a0b5c7..ab625490966 100644
--- a/app/serializers/board_simple_entity.rb
+++ b/app/serializers/board_simple_entity.rb
@@ -5,4 +5,4 @@ class BoardSimpleEntity < Grape::Entity
expose :name
end
-BoardSimpleEntity.prepend_if_ee('EE::BoardSimpleEntity')
+BoardSimpleEntity.prepend_mod_with('BoardSimpleEntity')
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb
index 0ddcad4dcb9..6fbd14f523d 100644
--- a/app/serializers/build_details_entity.rb
+++ b/app/serializers/build_details_entity.rb
@@ -155,4 +155,4 @@ class BuildDetailsEntity < JobEntity
end
end
-BuildDetailsEntity.prepend_if_ee('::EE::BuildDetailEntity')
+BuildDetailsEntity.prepend_mod_with('BuildDetailEntity')
diff --git a/app/serializers/ci/pipeline_entity.rb b/app/serializers/ci/pipeline_entity.rb
index 743643a978f..fa0e904fbde 100644
--- a/app/serializers/ci/pipeline_entity.rb
+++ b/app/serializers/ci/pipeline_entity.rb
@@ -121,4 +121,4 @@ class Ci::PipelineEntity < Grape::Entity
end
end
-Ci::PipelineEntity.prepend_if_ee('EE::Ci::PipelineEntity')
+Ci::PipelineEntity.prepend_mod_with('Ci::PipelineEntity')
diff --git a/app/serializers/current_board_entity.rb b/app/serializers/current_board_entity.rb
index 08f31bc698f..530f7f5dea3 100644
--- a/app/serializers/current_board_entity.rb
+++ b/app/serializers/current_board_entity.rb
@@ -7,4 +7,4 @@ class CurrentBoardEntity < Grape::Entity
expose :hide_closed_list
end
-CurrentBoardEntity.prepend_if_ee('EE::CurrentBoardEntity')
+CurrentBoardEntity.prepend_mod_with('CurrentBoardEntity')
diff --git a/app/serializers/discussion_serializer.rb b/app/serializers/discussion_serializer.rb
index 7e7148b046e..8bae5687a64 100644
--- a/app/serializers/discussion_serializer.rb
+++ b/app/serializers/discussion_serializer.rb
@@ -18,4 +18,4 @@ class DiscussionSerializer < BaseSerializer
end
end
-DiscussionSerializer.prepend_if_ee('EE::DiscussionSerializer')
+DiscussionSerializer.prepend_mod_with('DiscussionSerializer')
diff --git a/app/serializers/environment_entity.rb b/app/serializers/environment_entity.rb
index 66ca2382901..6835d139065 100644
--- a/app/serializers/environment_entity.rb
+++ b/app/serializers/environment_entity.rb
@@ -122,4 +122,4 @@ class EnvironmentEntity < Grape::Entity
end
end
-EnvironmentEntity.prepend_if_ee('::EE::EnvironmentEntity')
+EnvironmentEntity.prepend_mod_with('EnvironmentEntity')
diff --git a/app/serializers/environment_serializer.rb b/app/serializers/environment_serializer.rb
index c7358e3b9d4..2fb1ad52135 100644
--- a/app/serializers/environment_serializer.rb
+++ b/app/serializers/environment_serializer.rb
@@ -98,4 +98,4 @@ class EnvironmentSerializer < BaseSerializer
# rubocop: enable CodeReuse/ActiveRecord
end
-EnvironmentSerializer.prepend_if_ee('EE::EnvironmentSerializer')
+EnvironmentSerializer.prepend_mod_with('EnvironmentSerializer')
diff --git a/app/serializers/evidences/release_entity.rb b/app/serializers/evidences/release_entity.rb
index dfc4f52de07..3b16347d7c0 100644
--- a/app/serializers/evidences/release_entity.rb
+++ b/app/serializers/evidences/release_entity.rb
@@ -12,4 +12,4 @@ module Evidences
end
end
-Evidences::ReleaseEntity.prepend_if_ee('EE::Evidences::ReleaseEntity')
+Evidences::ReleaseEntity.prepend_mod_with('Evidences::ReleaseEntity')
diff --git a/app/serializers/fork_namespace_entity.rb b/app/serializers/fork_namespace_entity.rb
index fc238fa3958..fbcdf91a1af 100644
--- a/app/serializers/fork_namespace_entity.rb
+++ b/app/serializers/fork_namespace_entity.rb
@@ -49,4 +49,4 @@ class ForkNamespaceEntity < Grape::Entity
end
end
-ForkNamespaceEntity.prepend_if_ee('EE::ForkNamespaceEntity')
+ForkNamespaceEntity.prepend_mod_with('ForkNamespaceEntity')
diff --git a/app/serializers/group_child_entity.rb b/app/serializers/group_child_entity.rb
index adbda790dee..619ca0b5f82 100644
--- a/app/serializers/group_child_entity.rb
+++ b/app/serializers/group_child_entity.rb
@@ -100,4 +100,4 @@ class GroupChildEntity < Grape::Entity
end
end
-GroupChildEntity.prepend_if_ee('EE::GroupChildEntity')
+GroupChildEntity.prepend_mod_with('GroupChildEntity')
diff --git a/app/serializers/issuable_sidebar_basic_entity.rb b/app/serializers/issuable_sidebar_basic_entity.rb
index 4b3d6f21d6d..14e416fb71a 100644
--- a/app/serializers/issuable_sidebar_basic_entity.rb
+++ b/app/serializers/issuable_sidebar_basic_entity.rb
@@ -118,4 +118,4 @@ class IssuableSidebarBasicEntity < Grape::Entity
end
end
-IssuableSidebarBasicEntity.prepend_if_ee('EE::IssuableSidebarBasicEntity')
+IssuableSidebarBasicEntity.prepend_mod_with('IssuableSidebarBasicEntity')
diff --git a/app/serializers/issue_board_entity.rb b/app/serializers/issue_board_entity.rb
index ea629d9d774..d27e4096390 100644
--- a/app/serializers/issue_board_entity.rb
+++ b/app/serializers/issue_board_entity.rb
@@ -53,4 +53,4 @@ class IssueBoardEntity < Grape::Entity
end
end
-IssueBoardEntity.prepend_if_ee('EE::IssueBoardEntity')
+IssueBoardEntity.prepend_mod_with('IssueBoardEntity')
diff --git a/app/serializers/issue_entity.rb b/app/serializers/issue_entity.rb
index 647a73495f8..773bbf268eb 100644
--- a/app/serializers/issue_entity.rb
+++ b/app/serializers/issue_entity.rb
@@ -77,4 +77,4 @@ class IssueEntity < IssuableEntity
end
end
-IssueEntity.prepend_if_ee('::EE::IssueEntity')
+IssueEntity.prepend_mod_with('IssueEntity')
diff --git a/app/serializers/issue_sidebar_basic_entity.rb b/app/serializers/issue_sidebar_basic_entity.rb
index e9e05718af9..f93a42e5f98 100644
--- a/app/serializers/issue_sidebar_basic_entity.rb
+++ b/app/serializers/issue_sidebar_basic_entity.rb
@@ -6,4 +6,4 @@ class IssueSidebarBasicEntity < IssuableSidebarBasicEntity
expose :severity
end
-IssueSidebarBasicEntity.prepend_if_ee('EE::IssueSidebarBasicEntity')
+IssueSidebarBasicEntity.prepend_mod_with('IssueSidebarBasicEntity')
diff --git a/app/serializers/issue_sidebar_extras_entity.rb b/app/serializers/issue_sidebar_extras_entity.rb
index ea2a49baa41..6fd1045882b 100644
--- a/app/serializers/issue_sidebar_extras_entity.rb
+++ b/app/serializers/issue_sidebar_extras_entity.rb
@@ -3,4 +3,4 @@
class IssueSidebarExtrasEntity < IssuableSidebarExtrasEntity
end
-IssueSidebarExtrasEntity.prepend_if_ee('EE::IssueSidebarExtrasEntity')
+IssueSidebarExtrasEntity.prepend_mod_with('IssueSidebarExtrasEntity')
diff --git a/app/serializers/member_entity.rb b/app/serializers/member_entity.rb
index 6cbdaeea5ea..7559a03bd3b 100644
--- a/app/serializers/member_entity.rb
+++ b/app/serializers/member_entity.rb
@@ -57,4 +57,4 @@ class MemberEntity < Grape::Entity
end
end
-MemberEntity.prepend_if_ee('EE::MemberEntity')
+MemberEntity.prepend_mod_with('MemberEntity')
diff --git a/app/serializers/member_user_entity.rb b/app/serializers/member_user_entity.rb
index a022966c041..01920fc95bb 100644
--- a/app/serializers/member_user_entity.rb
+++ b/app/serializers/member_user_entity.rb
@@ -25,4 +25,4 @@ class MemberUserEntity < UserEntity
end
end
-MemberUserEntity.prepend_if_ee('EE::MemberUserEntity')
+MemberUserEntity.prepend_mod_with('MemberUserEntity')
diff --git a/app/serializers/merge_request_poll_cached_widget_entity.rb b/app/serializers/merge_request_poll_cached_widget_entity.rb
index 52f5b975656..6ac43e02f3c 100644
--- a/app/serializers/merge_request_poll_cached_widget_entity.rb
+++ b/app/serializers/merge_request_poll_cached_widget_entity.rb
@@ -187,4 +187,4 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity
end
end
-MergeRequestPollCachedWidgetEntity.prepend_if_ee('EE::MergeRequestPollCachedWidgetEntity')
+MergeRequestPollCachedWidgetEntity.prepend_mod_with('MergeRequestPollCachedWidgetEntity')
diff --git a/app/serializers/merge_request_poll_widget_entity.rb b/app/serializers/merge_request_poll_widget_entity.rb
index 97a81d8170f..c00dceadf22 100644
--- a/app/serializers/merge_request_poll_widget_entity.rb
+++ b/app/serializers/merge_request_poll_widget_entity.rb
@@ -158,4 +158,4 @@ class MergeRequestPollWidgetEntity < Grape::Entity
end
end
-MergeRequestPollWidgetEntity.prepend_if_ee('EE::MergeRequestPollWidgetEntity')
+MergeRequestPollWidgetEntity.prepend_mod_with('MergeRequestPollWidgetEntity')
diff --git a/app/serializers/merge_request_serializer.rb b/app/serializers/merge_request_serializer.rb
index 508a2510dbd..e8fc18e6cf3 100644
--- a/app/serializers/merge_request_serializer.rb
+++ b/app/serializers/merge_request_serializer.rb
@@ -28,4 +28,4 @@ class MergeRequestSerializer < BaseSerializer
end
end
-MergeRequestSerializer.prepend_if_ee('EE::MergeRequestSerializer')
+MergeRequestSerializer.prepend_mod_with('MergeRequestSerializer')
diff --git a/app/serializers/merge_request_user_entity.rb b/app/serializers/merge_request_user_entity.rb
index a36c4da3e83..66672494bd9 100644
--- a/app/serializers/merge_request_user_entity.rb
+++ b/app/serializers/merge_request_user_entity.rb
@@ -29,4 +29,4 @@ class MergeRequestUserEntity < ::API::Entities::UserBasic
end
end
-MergeRequestUserEntity.prepend_if_ee('EE::MergeRequestUserEntity')
+MergeRequestUserEntity.prepend_mod_with('MergeRequestUserEntity')
diff --git a/app/serializers/merge_request_widget_entity.rb b/app/serializers/merge_request_widget_entity.rb
index ebf21197b77..ac9970579ed 100644
--- a/app/serializers/merge_request_widget_entity.rb
+++ b/app/serializers/merge_request_widget_entity.rb
@@ -176,4 +176,4 @@ class MergeRequestWidgetEntity < Grape::Entity
end
end
-MergeRequestWidgetEntity.prepend_if_ee('EE::MergeRequestWidgetEntity')
+MergeRequestWidgetEntity.prepend_mod_with('MergeRequestWidgetEntity')
diff --git a/app/serializers/note_entity.rb b/app/serializers/note_entity.rb
index d44958bc0c4..8308e954c06 100644
--- a/app/serializers/note_entity.rb
+++ b/app/serializers/note_entity.rb
@@ -103,4 +103,4 @@ class NoteEntity < API::Entities::Note
end
end
-NoteEntity.prepend_if_ee('EE::NoteEntity')
+NoteEntity.prepend_mod_with('NoteEntity')
diff --git a/app/serializers/note_user_entity.rb b/app/serializers/note_user_entity.rb
index 38e71528f18..c3f14fb0f9e 100644
--- a/app/serializers/note_user_entity.rb
+++ b/app/serializers/note_user_entity.rb
@@ -4,4 +4,4 @@ class NoteUserEntity < UserEntity
unexpose :web_url
end
-NoteUserEntity.prepend_if_ee('EE::NoteUserEntity')
+NoteUserEntity.prepend_mod_with('NoteUserEntity')
diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb
index 066af67038c..9cfc81e8705 100644
--- a/app/serializers/pipeline_serializer.rb
+++ b/app/serializers/pipeline_serializer.rb
@@ -70,4 +70,4 @@ class PipelineSerializer < BaseSerializer
end
end
-PipelineSerializer.prepend_if_ee('EE::PipelineSerializer')
+PipelineSerializer.prepend_mod_with('PipelineSerializer')
diff --git a/app/serializers/project_mirror_entity.rb b/app/serializers/project_mirror_entity.rb
index daea209deb4..215f659caba 100644
--- a/app/serializers/project_mirror_entity.rb
+++ b/app/serializers/project_mirror_entity.rb
@@ -8,4 +8,4 @@ class ProjectMirrorEntity < Grape::Entity
end
end
-ProjectMirrorEntity.prepend_if_ee('::EE::ProjectMirrorEntity')
+ProjectMirrorEntity.prepend_mod_with('ProjectMirrorEntity')
diff --git a/app/serializers/user_entity.rb b/app/serializers/user_entity.rb
index 9386c06b87a..1a2778cbf30 100644
--- a/app/serializers/user_entity.rb
+++ b/app/serializers/user_entity.rb
@@ -3,4 +3,4 @@
class UserEntity < API::Entities::UserPath
end
-UserEntity.prepend_if_ee('EE::UserEntity')
+UserEntity.prepend_mod_with('UserEntity')
diff --git a/app/serializers/user_preference_entity.rb b/app/serializers/user_preference_entity.rb
index 4a5dda1e364..24c5bccdeb9 100644
--- a/app/serializers/user_preference_entity.rb
+++ b/app/serializers/user_preference_entity.rb
@@ -13,4 +13,4 @@ class UserPreferenceEntity < Grape::Entity
end
end
-UserPreferenceEntity.prepend_if_ee('EE::UserPreferenceEntity')
+UserPreferenceEntity.prepend_mod_with('UserPreferenceEntity')
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index dfbd787298d..5e7dab31e8a 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -21,4 +21,4 @@ class UserSerializer < BaseSerializer
end
end
-UserSerializer.prepend_if_ee('EE::UserSerializer')
+UserSerializer.prepend_mod_with('UserSerializer')
diff --git a/app/services/alert_management/http_integrations/create_service.rb b/app/services/alert_management/http_integrations/create_service.rb
index e7f1084ce5c..1abe0548c45 100644
--- a/app/services/alert_management/http_integrations/create_service.rb
+++ b/app/services/alert_management/http_integrations/create_service.rb
@@ -66,4 +66,4 @@ module AlertManagement
end
end
-::AlertManagement::HttpIntegrations::CreateService.prepend_if_ee('::EE::AlertManagement::HttpIntegrations::CreateService')
+::AlertManagement::HttpIntegrations::CreateService.prepend_mod_with('AlertManagement::HttpIntegrations::CreateService')
diff --git a/app/services/alert_management/http_integrations/update_service.rb b/app/services/alert_management/http_integrations/update_service.rb
index af079f670b8..8662f966a2e 100644
--- a/app/services/alert_management/http_integrations/update_service.rb
+++ b/app/services/alert_management/http_integrations/update_service.rb
@@ -56,4 +56,4 @@ module AlertManagement
end
end
-::AlertManagement::HttpIntegrations::UpdateService.prepend_if_ee('::EE::AlertManagement::HttpIntegrations::UpdateService')
+::AlertManagement::HttpIntegrations::UpdateService.prepend_mod_with('AlertManagement::HttpIntegrations::UpdateService')
diff --git a/app/services/application_settings/update_service.rb b/app/services/application_settings/update_service.rb
index 7792b811b4e..7728982779e 100644
--- a/app/services/application_settings/update_service.rb
+++ b/app/services/application_settings/update_service.rb
@@ -120,4 +120,4 @@ module ApplicationSettings
end
end
-ApplicationSettings::UpdateService.prepend_if_ee('EE::ApplicationSettings::UpdateService')
+ApplicationSettings::UpdateService.prepend_mod_with('ApplicationSettings::UpdateService')
diff --git a/app/services/applications/create_service.rb b/app/services/applications/create_service.rb
index 92500fbc254..96cde9057c7 100644
--- a/app/services/applications/create_service.rb
+++ b/app/services/applications/create_service.rb
@@ -25,4 +25,4 @@ module Applications
end
end
-Applications::CreateService.prepend_if_ee('EE::Applications::CreateService')
+Applications::CreateService.prepend_mod_with('Applications::CreateService')
diff --git a/app/services/audit_event_service.rb b/app/services/audit_event_service.rb
index 617e70989bb..60421f61007 100644
--- a/app/services/audit_event_service.rb
+++ b/app/services/audit_event_service.rb
@@ -136,4 +136,4 @@ class AuditEventService
end
end
-AuditEventService.prepend_if_ee('EE::AuditEventService')
+AuditEventService.prepend_mod_with('AuditEventService')
diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index d74f20511bd..5fde346c4ab 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -251,4 +251,4 @@ module Auth
end
end
-Auth::ContainerRegistryAuthenticationService.prepend_if_ee('EE::Auth::ContainerRegistryAuthenticationService')
+Auth::ContainerRegistryAuthenticationService.prepend_mod_with('Auth::ContainerRegistryAuthenticationService')
diff --git a/app/services/auto_merge_service.rb b/app/services/auto_merge_service.rb
index c5cbcc7c93b..912248d3a06 100644
--- a/app/services/auto_merge_service.rb
+++ b/app/services/auto_merge_service.rb
@@ -74,4 +74,4 @@ class AutoMergeService < BaseService
end
end
-AutoMergeService.prepend_if_ee('EE::AutoMergeService')
+AutoMergeService.prepend_mod_with('AutoMergeService')
diff --git a/app/services/award_emojis/add_service.rb b/app/services/award_emojis/add_service.rb
index ceb7a38cead..f45a4330c09 100644
--- a/app/services/award_emojis/add_service.rb
+++ b/app/services/award_emojis/add_service.rb
@@ -46,4 +46,4 @@ module AwardEmojis
end
end
-AwardEmojis::AddService.prepend_if_ee('EE::AwardEmojis::AddService')
+AwardEmojis::AddService.prepend_mod_with('AwardEmojis::AddService')
diff --git a/app/services/award_emojis/destroy_service.rb b/app/services/award_emojis/destroy_service.rb
index cfd194262f9..47dc8418e07 100644
--- a/app/services/award_emojis/destroy_service.rb
+++ b/app/services/award_emojis/destroy_service.rb
@@ -26,4 +26,4 @@ module AwardEmojis
end
end
-AwardEmojis::DestroyService.prepend_if_ee('EE::AwardEmojis::DestroyService')
+AwardEmojis::DestroyService.prepend_mod_with('AwardEmojis::DestroyService')
diff --git a/app/services/base_count_service.rb b/app/services/base_count_service.rb
index 2936bdae16e..c316c488148 100644
--- a/app/services/base_count_service.rb
+++ b/app/services/base_count_service.rb
@@ -49,4 +49,4 @@ class BaseCountService
end
end
-BaseCountService.prepend_if_ee('EE::BaseCountService')
+BaseCountService.prepend_mod_with('BaseCountService')
diff --git a/app/services/boards/base_service.rb b/app/services/boards/base_service.rb
index 83bb69b3822..f371f88d44b 100644
--- a/app/services/boards/base_service.rb
+++ b/app/services/boards/base_service.rb
@@ -13,4 +13,4 @@ module Boards
end
end
-Boards::BaseService.prepend_if_ee('EE::Boards::BaseService')
+Boards::BaseService.prepend_mod_with('Boards::BaseService')
diff --git a/app/services/boards/create_service.rb b/app/services/boards/create_service.rb
index 54dab581686..5f014abe071 100644
--- a/app/services/boards/create_service.rb
+++ b/app/services/boards/create_service.rb
@@ -37,4 +37,4 @@ module Boards
end
end
-Boards::CreateService.prepend_if_ee('EE::Boards::CreateService')
+Boards::CreateService.prepend_mod_with('Boards::CreateService')
diff --git a/app/services/boards/issues/create_service.rb b/app/services/boards/issues/create_service.rb
index 1769966a049..d036556f22a 100644
--- a/app/services/boards/issues/create_service.rb
+++ b/app/services/boards/issues/create_service.rb
@@ -36,4 +36,4 @@ module Boards
end
end
-Boards::Issues::CreateService.prepend_if_ee('EE::Boards::Issues::CreateService')
+Boards::Issues::CreateService.prepend_mod_with('Boards::Issues::CreateService')
diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb
index c6855f29af0..6284e454561 100644
--- a/app/services/boards/issues/list_service.rb
+++ b/app/services/boards/issues/list_service.rb
@@ -50,4 +50,4 @@ module Boards
end
end
-Boards::Issues::ListService.prepend_if_ee('EE::Boards::Issues::ListService')
+Boards::Issues::ListService.prepend_mod_with('Boards::Issues::ListService')
diff --git a/app/services/boards/issues/move_service.rb b/app/services/boards/issues/move_service.rb
index 76ea57968b2..05f9ccb6172 100644
--- a/app/services/boards/issues/move_service.rb
+++ b/app/services/boards/issues/move_service.rb
@@ -62,4 +62,4 @@ module Boards
end
end
-Boards::Issues::MoveService.prepend_if_ee('EE::Boards::Issues::MoveService')
+Boards::Issues::MoveService.prepend_mod_with('Boards::Issues::MoveService')
diff --git a/app/services/boards/lists/create_service.rb b/app/services/boards/lists/create_service.rb
index 37fe0a815bd..3ee0b6d8821 100644
--- a/app/services/boards/lists/create_service.rb
+++ b/app/services/boards/lists/create_service.rb
@@ -7,4 +7,4 @@ module Boards
end
end
-Boards::Lists::CreateService.prepend_if_ee('EE::Boards::Lists::CreateService')
+Boards::Lists::CreateService.prepend_mod_with('Boards::Lists::CreateService')
diff --git a/app/services/boards/lists/list_service.rb b/app/services/boards/lists/list_service.rb
index 03d54a8c74c..e81ef467a4e 100644
--- a/app/services/boards/lists/list_service.rb
+++ b/app/services/boards/lists/list_service.rb
@@ -32,4 +32,4 @@ module Boards
end
end
-Boards::Lists::ListService.prepend_if_ee('EE::Boards::Lists::ListService')
+Boards::Lists::ListService.prepend_mod_with('Boards::Lists::ListService')
diff --git a/app/services/boards/lists/update_service.rb b/app/services/boards/lists/update_service.rb
index 2e1a6592cd9..5c24c0daa73 100644
--- a/app/services/boards/lists/update_service.rb
+++ b/app/services/boards/lists/update_service.rb
@@ -14,4 +14,4 @@ module Boards
end
end
-Boards::Lists::UpdateService.prepend_if_ee('EE::Boards::Lists::UpdateService')
+Boards::Lists::UpdateService.prepend_mod_with('Boards::Lists::UpdateService')
diff --git a/app/services/boards/update_service.rb b/app/services/boards/update_service.rb
index 48c6e44d55e..6ba8f68a4cb 100644
--- a/app/services/boards/update_service.rb
+++ b/app/services/boards/update_service.rb
@@ -19,4 +19,4 @@ module Boards
end
end
-Boards::UpdateService.prepend_if_ee('EE::Boards::UpdateService')
+Boards::UpdateService.prepend_mod_with('Boards::UpdateService')
diff --git a/app/services/ci/change_variable_service.rb b/app/services/ci/change_variable_service.rb
index f515a335d54..83cd6aae14b 100644
--- a/app/services/ci/change_variable_service.rb
+++ b/app/services/ci/change_variable_service.rb
@@ -30,4 +30,4 @@ module Ci
end
end
-::Ci::ChangeVariableService.prepend_if_ee('EE::Ci::ChangeVariableService')
+::Ci::ChangeVariableService.prepend_mod_with('Ci::ChangeVariableService')
diff --git a/app/services/ci/change_variables_service.rb b/app/services/ci/change_variables_service.rb
index 3337eb09411..7a68bd2e2b3 100644
--- a/app/services/ci/change_variables_service.rb
+++ b/app/services/ci/change_variables_service.rb
@@ -8,4 +8,4 @@ module Ci
end
end
-::Ci::ChangeVariablesService.prepend_if_ee('EE::Ci::ChangeVariablesService')
+::Ci::ChangeVariablesService.prepend_mod_with('Ci::ChangeVariablesService')
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index bdbef9117e6..fd333e24860 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -132,4 +132,4 @@ module Ci
end
end
-Ci::CreatePipelineService.prepend_if_ee('EE::Ci::CreatePipelineService')
+Ci::CreatePipelineService.prepend_mod_with('Ci::CreatePipelineService')
diff --git a/app/services/ci/job_artifacts/destroy_batch_service.rb b/app/services/ci/job_artifacts/destroy_batch_service.rb
index 95315dd11ec..8ecf5cf55dd 100644
--- a/app/services/ci/job_artifacts/destroy_batch_service.rb
+++ b/app/services/ci/job_artifacts/destroy_batch_service.rb
@@ -71,4 +71,4 @@ module Ci
end
end
-Ci::JobArtifacts::DestroyBatchService.prepend_if_ee('EE::Ci::JobArtifacts::DestroyBatchService')
+Ci::JobArtifacts::DestroyBatchService.prepend_mod_with('Ci::JobArtifacts::DestroyBatchService')
diff --git a/app/services/ci/pipeline_bridge_status_service.rb b/app/services/ci/pipeline_bridge_status_service.rb
index e2e5dd386f2..aeac43588f7 100644
--- a/app/services/ci/pipeline_bridge_status_service.rb
+++ b/app/services/ci/pipeline_bridge_status_service.rb
@@ -17,4 +17,4 @@ module Ci
end
end
-Ci::PipelineBridgeStatusService.prepend_if_ee('EE::Ci::PipelineBridgeStatusService')
+Ci::PipelineBridgeStatusService.prepend_mod_with('Ci::PipelineBridgeStatusService')
diff --git a/app/services/ci/process_build_service.rb b/app/services/ci/process_build_service.rb
index 73cf3308fe7..5271c0fe93d 100644
--- a/app/services/ci/process_build_service.rb
+++ b/app/services/ci/process_build_service.rb
@@ -40,4 +40,4 @@ module Ci
end
end
-Ci::ProcessBuildService.prepend_if_ee('EE::Ci::ProcessBuildService')
+Ci::ProcessBuildService.prepend_mod_with('Ci::ProcessBuildService')
diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb
index bb82f9eed22..461647ffccc 100644
--- a/app/services/ci/register_job_service.rb
+++ b/app/services/ci/register_job_service.rb
@@ -316,4 +316,4 @@ module Ci
end
end
-Ci::RegisterJobService.prepend_if_ee('EE::Ci::RegisterJobService')
+Ci::RegisterJobService.prepend_mod_with('Ci::RegisterJobService')
diff --git a/app/services/ci/retry_build_service.rb b/app/services/ci/retry_build_service.rb
index e3de7f43fda..d5e64828c1f 100644
--- a/app/services/ci/retry_build_service.rb
+++ b/app/services/ci/retry_build_service.rb
@@ -64,4 +64,4 @@ module Ci
end
end
-Ci::RetryBuildService.prepend_if_ee('EE::Ci::RetryBuildService')
+Ci::RetryBuildService.prepend_mod_with('Ci::RetryBuildService')
diff --git a/app/services/commits/create_service.rb b/app/services/commits/create_service.rb
index a1498da302e..fc18420f6e4 100644
--- a/app/services/commits/create_service.rb
+++ b/app/services/commits/create_service.rb
@@ -113,4 +113,4 @@ module Commits
end
end
-Commits::CreateService.prepend_if_ee('EE::Commits::CreateService')
+Commits::CreateService.prepend_mod_with('Commits::CreateService')
diff --git a/app/services/concerns/alert_management/alert_processing.rb b/app/services/concerns/alert_management/alert_processing.rb
index a1520258de8..9690d703408 100644
--- a/app/services/concerns/alert_management/alert_processing.rb
+++ b/app/services/concerns/alert_management/alert_processing.rb
@@ -129,4 +129,4 @@ module AlertManagement
end
end
-AlertManagement::AlertProcessing.prepend_ee_mod
+AlertManagement::AlertProcessing.prepend_mod
diff --git a/app/services/concerns/measurable.rb b/app/services/concerns/measurable.rb
index fcb3022a1dc..ebce8a0667a 100644
--- a/app/services/concerns/measurable.rb
+++ b/app/services/concerns/measurable.rb
@@ -23,7 +23,7 @@
# end
# end
#
-# DummyService.prepend_if_ee('EE::DummyService')
+# DummyService.prepend_mod_with('DummyService')
# DummyService.prepend(Measurable)
# ```
#
diff --git a/app/services/deploy_keys/create_service.rb b/app/services/deploy_keys/create_service.rb
index 2dac94c7ade..3245e749164 100644
--- a/app/services/deploy_keys/create_service.rb
+++ b/app/services/deploy_keys/create_service.rb
@@ -8,4 +8,4 @@ module DeployKeys
end
end
-DeployKeys::CreateService.prepend_if_ee('::EE::DeployKeys::CreateService')
+DeployKeys::CreateService.prepend_mod_with('DeployKeys::CreateService')
diff --git a/app/services/deployments/update_environment_service.rb b/app/services/deployments/update_environment_service.rb
index 98fedb9f699..9e862d6fa52 100644
--- a/app/services/deployments/update_environment_service.rb
+++ b/app/services/deployments/update_environment_service.rb
@@ -77,4 +77,4 @@ module Deployments
end
end
-Deployments::UpdateEnvironmentService.prepend_if_ee('EE::Deployments::UpdateEnvironmentService')
+Deployments::UpdateEnvironmentService.prepend_mod_with('Deployments::UpdateEnvironmentService')
diff --git a/app/services/design_management/delete_designs_service.rb b/app/services/design_management/delete_designs_service.rb
index a90c34d4e34..7f76bcc5626 100644
--- a/app/services/design_management/delete_designs_service.rb
+++ b/app/services/design_management/delete_designs_service.rb
@@ -67,4 +67,4 @@ module DesignManagement
end
end
-DesignManagement::DeleteDesignsService.prepend_if_ee('EE::DesignManagement::DeleteDesignsService')
+DesignManagement::DeleteDesignsService.prepend_mod_with('DesignManagement::DeleteDesignsService')
diff --git a/app/services/design_management/save_designs_service.rb b/app/services/design_management/save_designs_service.rb
index c26d2e7ab47..44ebd45f76e 100644
--- a/app/services/design_management/save_designs_service.rb
+++ b/app/services/design_management/save_designs_service.rb
@@ -141,4 +141,4 @@ module DesignManagement
end
end
-DesignManagement::SaveDesignsService.prepend_if_ee('EE::DesignManagement::SaveDesignsService')
+DesignManagement::SaveDesignsService.prepend_mod_with('DesignManagement::SaveDesignsService')
diff --git a/app/services/emails/base_service.rb b/app/services/emails/base_service.rb
index c94505b2068..58fc9799673 100644
--- a/app/services/emails/base_service.rb
+++ b/app/services/emails/base_service.rb
@@ -12,4 +12,4 @@ module Emails
end
end
-Emails::BaseService.prepend_if_ee('::EE::Emails::BaseService')
+Emails::BaseService.prepend_mod_with('Emails::BaseService')
diff --git a/app/services/emails/create_service.rb b/app/services/emails/create_service.rb
index 473256d9c6f..011978ba76a 100644
--- a/app/services/emails/create_service.rb
+++ b/app/services/emails/create_service.rb
@@ -12,4 +12,4 @@ module Emails
end
end
-Emails::CreateService.prepend_if_ee('EE::Emails::CreateService')
+Emails::CreateService.prepend_mod_with('Emails::CreateService')
diff --git a/app/services/emails/destroy_service.rb b/app/services/emails/destroy_service.rb
index 6e671f52d57..288bee84ef7 100644
--- a/app/services/emails/destroy_service.rb
+++ b/app/services/emails/destroy_service.rb
@@ -18,4 +18,4 @@ module Emails
end
end
-Emails::DestroyService.prepend_if_ee('EE::Emails::DestroyService')
+Emails::DestroyService.prepend_mod_with('Emails::DestroyService')
diff --git a/app/services/event_create_service.rb b/app/services/event_create_service.rb
index 85658598afc..01a40fc6473 100644
--- a/app/services/event_create_service.rb
+++ b/app/services/event_create_service.rb
@@ -222,4 +222,4 @@ class EventCreateService
end
end
-EventCreateService.prepend_if_ee('EE::EventCreateService')
+EventCreateService.prepend_mod_with('EventCreateService')
diff --git a/app/services/git/branch_hooks_service.rb b/app/services/git/branch_hooks_service.rb
index 4b802803a07..a49b981c680 100644
--- a/app/services/git/branch_hooks_service.rb
+++ b/app/services/git/branch_hooks_service.rb
@@ -226,4 +226,4 @@ module Git
end
end
-Git::BranchHooksService.prepend_if_ee('::EE::Git::BranchHooksService')
+Git::BranchHooksService.prepend_mod_with('Git::BranchHooksService')
diff --git a/app/services/git/branch_push_service.rb b/app/services/git/branch_push_service.rb
index d250bca7bf2..5dcc2de456c 100644
--- a/app/services/git/branch_push_service.rb
+++ b/app/services/git/branch_push_service.rb
@@ -94,4 +94,4 @@ module Git
end
end
-Git::BranchPushService.prepend_if_ee('::EE::Git::BranchPushService')
+Git::BranchPushService.prepend_mod_with('Git::BranchPushService')
diff --git a/app/services/git/tag_hooks_service.rb b/app/services/git/tag_hooks_service.rb
index 0e5e1bbc992..d83924fec28 100644
--- a/app/services/git/tag_hooks_service.rb
+++ b/app/services/git/tag_hooks_service.rb
@@ -35,4 +35,4 @@ module Git
end
end
-Git::TagHooksService.prepend_if_ee('::EE::Git::TagHooksService')
+Git::TagHooksService.prepend_mod_with('Git::TagHooksService')
diff --git a/app/services/git/wiki_push_service.rb b/app/services/git/wiki_push_service.rb
index 82958abfe6e..11aeb650a5b 100644
--- a/app/services/git/wiki_push_service.rb
+++ b/app/services/git/wiki_push_service.rb
@@ -86,4 +86,4 @@ module Git
end
end
-Git::WikiPushService.prepend_if_ee('EE::Git::WikiPushService')
+Git::WikiPushService.prepend_mod_with('Git::WikiPushService')
diff --git a/app/services/groups/autocomplete_service.rb b/app/services/groups/autocomplete_service.rb
index 14f11bb3cfd..92b05d9ac08 100644
--- a/app/services/groups/autocomplete_service.rb
+++ b/app/services/groups/autocomplete_service.rb
@@ -46,4 +46,4 @@ module Groups
end
end
-Groups::AutocompleteService.prepend_if_ee('EE::Groups::AutocompleteService')
+Groups::AutocompleteService.prepend_mod
diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb
index 9ddb8ae7695..80c428f727c 100644
--- a/app/services/groups/create_service.rb
+++ b/app/services/groups/create_service.rb
@@ -103,4 +103,4 @@ module Groups
end
end
-Groups::CreateService.prepend_if_ee('EE::Groups::CreateService')
+Groups::CreateService.prepend_mod_with('Groups::CreateService')
diff --git a/app/services/groups/destroy_service.rb b/app/services/groups/destroy_service.rb
index a27330d1104..08c4e0231e7 100644
--- a/app/services/groups/destroy_service.rb
+++ b/app/services/groups/destroy_service.rb
@@ -58,4 +58,4 @@ module Groups
end
end
-Groups::DestroyService.prepend_if_ee('EE::Groups::DestroyService')
+Groups::DestroyService.prepend_mod_with('Groups::DestroyService')
diff --git a/app/services/groups/import_export/export_service.rb b/app/services/groups/import_export/export_service.rb
index 5ba34460871..ea26ebec20b 100644
--- a/app/services/groups/import_export/export_service.rb
+++ b/app/services/groups/import_export/export_service.rb
@@ -127,4 +127,4 @@ module Groups
end
end
-Groups::ImportExport::ExportService.prepend_if_ee('EE::Groups::ImportExport::ExportService')
+Groups::ImportExport::ExportService.prepend_mod_with('Groups::ImportExport::ExportService')
diff --git a/app/services/groups/import_export/import_service.rb b/app/services/groups/import_export/import_service.rb
index 25ef2db49c3..f9db552f743 100644
--- a/app/services/groups/import_export/import_service.rb
+++ b/app/services/groups/import_export/import_service.rb
@@ -124,4 +124,4 @@ module Groups
end
end
-Groups::ImportExport::ImportService.prepend_if_ee('EE::Groups::ImportExport::ImportService')
+Groups::ImportExport::ImportService.prepend_mod_with('Groups::ImportExport::ImportService')
diff --git a/app/services/groups/transfer_service.rb b/app/services/groups/transfer_service.rb
index e800e546a45..ff0300d7e26 100644
--- a/app/services/groups/transfer_service.rb
+++ b/app/services/groups/transfer_service.rb
@@ -212,4 +212,4 @@ module Groups
end
end
-Groups::TransferService.prepend_if_ee('EE::Groups::TransferService')
+Groups::TransferService.prepend_mod_with('Groups::TransferService')
diff --git a/app/services/groups/update_service.rb b/app/services/groups/update_service.rb
index ff369d01efc..1ad43b051be 100644
--- a/app/services/groups/update_service.rb
+++ b/app/services/groups/update_service.rb
@@ -147,4 +147,4 @@ module Groups
end
end
-Groups::UpdateService.prepend_if_ee('EE::Groups::UpdateService')
+Groups::UpdateService.prepend_mod_with('Groups::UpdateService')
diff --git a/app/services/ide/schemas_config_service.rb b/app/services/ide/schemas_config_service.rb
index 65799c03364..a013a4679b5 100644
--- a/app/services/ide/schemas_config_service.rb
+++ b/app/services/ide/schemas_config_service.rb
@@ -46,4 +46,4 @@ module Ide
end
end
-Ide::SchemasConfigService.prepend_if_ee('::EE::Ide::SchemasConfigService')
+Ide::SchemasConfigService.prepend_mod_with('Ide::SchemasConfigService')
diff --git a/app/services/import/github_service.rb b/app/services/import/github_service.rb
index 3ee5a185f42..2f808d45ffd 100644
--- a/app/services/import/github_service.rb
+++ b/app/services/import/github_service.rb
@@ -122,4 +122,4 @@ module Import
end
end
-Import::GithubService.prepend_if_ee('EE::Import::GithubService')
+Import::GithubService.prepend_mod_with('Import::GithubService')
diff --git a/app/services/integrations/test/project_service.rb b/app/services/integrations/test/project_service.rb
index d72ca928c34..31c8f02c7b6 100644
--- a/app/services/integrations/test/project_service.rb
+++ b/app/services/integrations/test/project_service.rb
@@ -42,4 +42,4 @@ module Integrations
end
end
-Integrations::Test::ProjectService.prepend_if_ee('::EE::Integrations::Test::ProjectService')
+Integrations::Test::ProjectService.prepend_mod_with('Integrations::Test::ProjectService')
diff --git a/app/services/issuable/bulk_update_service.rb b/app/services/issuable/bulk_update_service.rb
index 5d5a6db92bb..824415215ec 100644
--- a/app/services/issuable/bulk_update_service.rb
+++ b/app/services/issuable/bulk_update_service.rb
@@ -99,4 +99,4 @@ module Issuable
end
end
-Issuable::BulkUpdateService.prepend_if_ee('EE::Issuable::BulkUpdateService')
+Issuable::BulkUpdateService.prepend_mod_with('Issuable::BulkUpdateService')
diff --git a/app/services/issuable/clone/attributes_rewriter.rb b/app/services/issuable/clone/attributes_rewriter.rb
index 3861d88bce9..d0544dabbfd 100644
--- a/app/services/issuable/clone/attributes_rewriter.rb
+++ b/app/services/issuable/clone/attributes_rewriter.rb
@@ -118,4 +118,4 @@ module Issuable
end
end
-Issuable::Clone::AttributesRewriter.prepend_if_ee('EE::Issuable::Clone::AttributesRewriter')
+Issuable::Clone::AttributesRewriter.prepend_mod_with('Issuable::Clone::AttributesRewriter')
diff --git a/app/services/issuable/clone/base_service.rb b/app/services/issuable/clone/base_service.rb
index 3c2bc527b12..3d73a142f31 100644
--- a/app/services/issuable/clone/base_service.rb
+++ b/app/services/issuable/clone/base_service.rb
@@ -88,4 +88,4 @@ module Issuable
end
end
-Issuable::Clone::BaseService.prepend_if_ee('EE::Issuable::Clone::BaseService')
+Issuable::Clone::BaseService.prepend_mod_with('Issuable::Clone::BaseService')
diff --git a/app/services/issuable/common_system_notes_service.rb b/app/services/issuable/common_system_notes_service.rb
index fd2dc3787c2..f69dde4caa8 100644
--- a/app/services/issuable/common_system_notes_service.rb
+++ b/app/services/issuable/common_system_notes_service.rb
@@ -109,4 +109,4 @@ module Issuable
end
end
-Issuable::CommonSystemNotesService.prepend_if_ee('EE::Issuable::CommonSystemNotesService')
+Issuable::CommonSystemNotesService.prepend_mod_with('Issuable::CommonSystemNotesService')
diff --git a/app/services/issuable/destroy_service.rb b/app/services/issuable/destroy_service.rb
index d5aa84d8d6c..1da3fbe0749 100644
--- a/app/services/issuable/destroy_service.rb
+++ b/app/services/issuable/destroy_service.rb
@@ -35,4 +35,4 @@ module Issuable
end
end
-Issuable::DestroyService.prepend_if_ee('EE::Issuable::DestroyService')
+Issuable::DestroyService.prepend_mod_with('Issuable::DestroyService')
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb
index add53bc6267..02d005fb569 100644
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -493,4 +493,4 @@ class IssuableBaseService < BaseService
end
end
-IssuableBaseService.prepend_if_ee('EE::IssuableBaseService')
+IssuableBaseService.prepend_mod_with('IssuableBaseService')
diff --git a/app/services/issuable_links/create_service.rb b/app/services/issuable_links/create_service.rb
index cbb81f1f521..81685f81afa 100644
--- a/app/services/issuable_links/create_service.rb
+++ b/app/services/issuable_links/create_service.rb
@@ -118,4 +118,4 @@ module IssuableLinks
end
end
-IssuableLinks::CreateService.prepend_if_ee('EE::IssuableLinks::CreateService')
+IssuableLinks::CreateService.prepend_mod_with('IssuableLinks::CreateService')
diff --git a/app/services/issue_links/create_service.rb b/app/services/issue_links/create_service.rb
index 63762b1af79..a022d3e0bcf 100644
--- a/app/services/issue_links/create_service.rb
+++ b/app/services/issue_links/create_service.rb
@@ -43,4 +43,4 @@ module IssueLinks
end
end
-IssueLinks::CreateService.prepend_if_ee('EE::IssueLinks::CreateService')
+IssueLinks::CreateService.prepend_mod_with('IssueLinks::CreateService')
diff --git a/app/services/issues/after_create_service.rb b/app/services/issues/after_create_service.rb
index 0c6ec65f0e2..5d10eca2979 100644
--- a/app/services/issues/after_create_service.rb
+++ b/app/services/issues/after_create_service.rb
@@ -10,4 +10,4 @@ module Issues
end
end
-Issues::AfterCreateService.prepend_ee_mod
+Issues::AfterCreateService.prepend_mod
diff --git a/app/services/issues/base_service.rb b/app/services/issues/base_service.rb
index 07e4a10708e..54b9e9d6c4b 100644
--- a/app/services/issues/base_service.rb
+++ b/app/services/issues/base_service.rb
@@ -78,4 +78,4 @@ module Issues
end
end
-Issues::BaseService.prepend_if_ee('EE::Issues::BaseService')
+Issues::BaseService.prepend_mod_with('Issues::BaseService')
diff --git a/app/services/issues/build_service.rb b/app/services/issues/build_service.rb
index 3145739fe91..bdb4b39b0ba 100644
--- a/app/services/issues/build_service.rb
+++ b/app/services/issues/build_service.rb
@@ -88,4 +88,4 @@ module Issues
end
end
-Issues::BuildService.prepend_if_ee('EE::Issues::BuildService')
+Issues::BuildService.prepend_mod_with('Issues::BuildService')
diff --git a/app/services/issues/clone_service.rb b/app/services/issues/clone_service.rb
index b64e4687a87..fc1cde5fabc 100644
--- a/app/services/issues/clone_service.rb
+++ b/app/services/issues/clone_service.rb
@@ -90,4 +90,4 @@ module Issues
end
end
-Issues::CloneService.prepend_if_ee('EE::Issues::CloneService')
+Issues::CloneService.prepend_mod_with('Issues::CloneService')
diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb
index 68660b35bee..951dad486cb 100644
--- a/app/services/issues/create_service.rb
+++ b/app/services/issues/create_service.rb
@@ -75,4 +75,4 @@ module Issues
end
end
-Issues::CreateService.prepend_ee_mod
+Issues::CreateService.prepend_mod
diff --git a/app/services/issues/export_csv_service.rb b/app/services/issues/export_csv_service.rb
index dd43c77adfa..3809d8bc347 100644
--- a/app/services/issues/export_csv_service.rb
+++ b/app/services/issues/export_csv_service.rb
@@ -58,4 +58,4 @@ module Issues
end
end
-Issues::ExportCsvService.prepend_if_ee('EE::Issues::ExportCsvService')
+Issues::ExportCsvService.prepend_mod_with('Issues::ExportCsvService')
diff --git a/app/services/issues/move_service.rb b/app/services/issues/move_service.rb
index c1afb8f456d..ace1434356b 100644
--- a/app/services/issues/move_service.rb
+++ b/app/services/issues/move_service.rb
@@ -106,4 +106,4 @@ module Issues
end
end
-Issues::MoveService.prepend_if_ee('EE::Issues::MoveService')
+Issues::MoveService.prepend_mod_with('Issues::MoveService')
diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb
index 934b7f2016e..bd3f80773ac 100644
--- a/app/services/issues/update_service.rb
+++ b/app/services/issues/update_service.rb
@@ -210,4 +210,4 @@ module Issues
end
end
-Issues::UpdateService.prepend_if_ee('EE::Issues::UpdateService')
+Issues::UpdateService.prepend_mod_with('Issues::UpdateService')
diff --git a/app/services/keys/create_service.rb b/app/services/keys/create_service.rb
index c1c3ef8792f..507537391ed 100644
--- a/app/services/keys/create_service.rb
+++ b/app/services/keys/create_service.rb
@@ -19,4 +19,4 @@ module Keys
end
end
-Keys::CreateService.prepend_if_ee('EE::Keys::CreateService')
+Keys::CreateService.prepend_mod_with('Keys::CreateService')
diff --git a/app/services/keys/destroy_service.rb b/app/services/keys/destroy_service.rb
index 4552c5cf9a2..eaf5eb35f58 100644
--- a/app/services/keys/destroy_service.rb
+++ b/app/services/keys/destroy_service.rb
@@ -13,4 +13,4 @@ module Keys
end
end
-Keys::DestroyService.prepend_if_ee('EE::Keys::DestroyService')
+Keys::DestroyService.prepend_mod_with('Keys::DestroyService')
diff --git a/app/services/labels/create_service.rb b/app/services/labels/create_service.rb
index 665d1035b2b..6c070d15cdb 100644
--- a/app/services/labels/create_service.rb
+++ b/app/services/labels/create_service.rb
@@ -26,4 +26,4 @@ module Labels
end
end
-Labels::CreateService.prepend_if_ee('EE::Labels::CreateService')
+Labels::CreateService.prepend_mod_with('Labels::CreateService')
diff --git a/app/services/labels/promote_service.rb b/app/services/labels/promote_service.rb
index fdf2cf13f92..e3b110f8f26 100644
--- a/app/services/labels/promote_service.rb
+++ b/app/services/labels/promote_service.rb
@@ -101,4 +101,4 @@ module Labels
end
end
-Labels::PromoteService.prepend_if_ee('EE::Labels::PromoteService')
+Labels::PromoteService.prepend_mod_with('Labels::PromoteService')
diff --git a/app/services/lfs/lock_file_service.rb b/app/services/lfs/lock_file_service.rb
index 03f8946362b..54f193c86e6 100644
--- a/app/services/lfs/lock_file_service.rb
+++ b/app/services/lfs/lock_file_service.rb
@@ -42,4 +42,4 @@ module Lfs
end
end
-Lfs::LockFileService.prepend_if_ee('EE::Lfs::LockFileService')
+Lfs::LockFileService.prepend_mod_with('Lfs::LockFileService')
diff --git a/app/services/lfs/unlock_file_service.rb b/app/services/lfs/unlock_file_service.rb
index f69f4091606..7a3025ee7ea 100644
--- a/app/services/lfs/unlock_file_service.rb
+++ b/app/services/lfs/unlock_file_service.rb
@@ -46,4 +46,4 @@ module Lfs
end
end
-Lfs::UnlockFileService.prepend_if_ee('EE::Lfs::UnlockFileService')
+Lfs::UnlockFileService.prepend_mod_with('Lfs::UnlockFileService')
diff --git a/app/services/members/approve_access_request_service.rb b/app/services/members/approve_access_request_service.rb
index e79c5f69a30..919c22894c1 100644
--- a/app/services/members/approve_access_request_service.rb
+++ b/app/services/members/approve_access_request_service.rb
@@ -21,4 +21,4 @@ module Members
end
end
-Members::ApproveAccessRequestService.prepend_if_ee('EE::Members::ApproveAccessRequestService')
+Members::ApproveAccessRequestService.prepend_mod_with('Members::ApproveAccessRequestService')
diff --git a/app/services/members/create_service.rb b/app/services/members/create_service.rb
index 953cf7f5bf6..7b81cc27635 100644
--- a/app/services/members/create_service.rb
+++ b/app/services/members/create_service.rb
@@ -98,4 +98,4 @@ module Members
end
end
-Members::CreateService.prepend_if_ee('EE::Members::CreateService')
+Members::CreateService.prepend_mod_with('Members::CreateService')
diff --git a/app/services/members/destroy_service.rb b/app/services/members/destroy_service.rb
index 8cad065e6cc..bb2d419c046 100644
--- a/app/services/members/destroy_service.rb
+++ b/app/services/members/destroy_service.rb
@@ -117,4 +117,4 @@ module Members
end
end
-Members::DestroyService.prepend_if_ee('EE::Members::DestroyService')
+Members::DestroyService.prepend_mod_with('Members::DestroyService')
diff --git a/app/services/members/update_service.rb b/app/services/members/update_service.rb
index 5c6e51201c2..257698f65ae 100644
--- a/app/services/members/update_service.rb
+++ b/app/services/members/update_service.rb
@@ -31,4 +31,4 @@ module Members
end
end
-Members::UpdateService.prepend_if_ee('EE::Members::UpdateService')
+Members::UpdateService.prepend_mod_with('Members::UpdateService')
diff --git a/app/services/merge_request_metrics_service.rb b/app/services/merge_request_metrics_service.rb
index 9ea71838011..d86bcca8892 100644
--- a/app/services/merge_request_metrics_service.rb
+++ b/app/services/merge_request_metrics_service.rb
@@ -20,4 +20,4 @@ class MergeRequestMetricsService
end
end
-MergeRequestMetricsService.prepend_if_ee('EE::MergeRequestMetricsService')
+MergeRequestMetricsService.prepend_mod_with('MergeRequestMetricsService')
diff --git a/app/services/merge_requests/after_create_service.rb b/app/services/merge_requests/after_create_service.rb
index ed9747a8c99..cce0d06b458 100644
--- a/app/services/merge_requests/after_create_service.rb
+++ b/app/services/merge_requests/after_create_service.rb
@@ -40,4 +40,4 @@ module MergeRequests
end
end
-MergeRequests::AfterCreateService.prepend_if_ee('EE::MergeRequests::AfterCreateService')
+MergeRequests::AfterCreateService.prepend_mod_with('MergeRequests::AfterCreateService')
diff --git a/app/services/merge_requests/approval_service.rb b/app/services/merge_requests/approval_service.rb
index 59d8f553eff..62e599e3e27 100644
--- a/app/services/merge_requests/approval_service.rb
+++ b/app/services/merge_requests/approval_service.rb
@@ -54,4 +54,4 @@ module MergeRequests
end
end
-MergeRequests::ApprovalService.prepend_if_ee('EE::MergeRequests::ApprovalService')
+MergeRequests::ApprovalService.prepend_mod_with('MergeRequests::ApprovalService')
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb
index 3a3765355d8..1072049738b 100644
--- a/app/services/merge_requests/base_service.rb
+++ b/app/services/merge_requests/base_service.rb
@@ -208,4 +208,4 @@ module MergeRequests
end
end
-MergeRequests::BaseService.prepend_if_ee('EE::MergeRequests::BaseService')
+MergeRequests::BaseService.prepend_mod_with('MergeRequests::BaseService')
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index ecc55eae5de..878e42172b7 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -300,4 +300,4 @@ module MergeRequests
end
end
-MergeRequests::BuildService.prepend_if_ee('EE::MergeRequests::BuildService')
+MergeRequests::BuildService.prepend_mod_with('MergeRequests::BuildService')
diff --git a/app/services/merge_requests/create_pipeline_service.rb b/app/services/merge_requests/create_pipeline_service.rb
index 46c4c102091..ebeba0ee5b8 100644
--- a/app/services/merge_requests/create_pipeline_service.rb
+++ b/app/services/merge_requests/create_pipeline_service.rb
@@ -63,4 +63,4 @@ module MergeRequests
end
end
-MergeRequests::CreatePipelineService.prepend_if_ee('EE::MergeRequests::CreatePipelineService')
+MergeRequests::CreatePipelineService.prepend_mod_with('MergeRequests::CreatePipelineService')
diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb
index 8186472ec65..c1292d924b2 100644
--- a/app/services/merge_requests/create_service.rb
+++ b/app/services/merge_requests/create_service.rb
@@ -53,4 +53,4 @@ module MergeRequests
end
end
-MergeRequests::CreateService.include_if_ee('EE::MergeRequests::CreateService')
+MergeRequests::CreateService.include_mod_with('MergeRequests::CreateService')
diff --git a/app/services/merge_requests/handle_assignees_change_service.rb b/app/services/merge_requests/handle_assignees_change_service.rb
index 77ff0791eb4..a8d122fb71f 100644
--- a/app/services/merge_requests/handle_assignees_change_service.rb
+++ b/app/services/merge_requests/handle_assignees_change_service.rb
@@ -40,4 +40,4 @@ module MergeRequests
end
end
-MergeRequests::HandleAssigneesChangeService.prepend_if_ee('EE::MergeRequests::HandleAssigneesChangeService')
+MergeRequests::HandleAssigneesChangeService.prepend_mod_with('MergeRequests::HandleAssigneesChangeService')
diff --git a/app/services/merge_requests/merge_base_service.rb b/app/services/merge_requests/merge_base_service.rb
index fe09c92aab9..3d1b7616e76 100644
--- a/app/services/merge_requests/merge_base_service.rb
+++ b/app/services/merge_requests/merge_base_service.rb
@@ -73,4 +73,4 @@ module MergeRequests
end
end
-MergeRequests::MergeBaseService.prepend_if_ee('EE::MergeRequests::MergeBaseService')
+MergeRequests::MergeBaseService.prepend_mod_with('MergeRequests::MergeBaseService')
diff --git a/app/services/merge_requests/post_merge_service.rb b/app/services/merge_requests/post_merge_service.rb
index 505625d2e00..1c9b802780e 100644
--- a/app/services/merge_requests/post_merge_service.rb
+++ b/app/services/merge_requests/post_merge_service.rb
@@ -67,4 +67,4 @@ module MergeRequests
end
end
-MergeRequests::PostMergeService.prepend_if_ee('EE::MergeRequests::PostMergeService')
+MergeRequests::PostMergeService.prepend_mod_with('MergeRequests::PostMergeService')
diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb
index 6a5a7196c61..463f9f3d6d1 100644
--- a/app/services/merge_requests/refresh_service.rb
+++ b/app/services/merge_requests/refresh_service.rb
@@ -304,4 +304,4 @@ module MergeRequests
end
end
-MergeRequests::RefreshService.prepend_if_ee('EE::MergeRequests::RefreshService')
+MergeRequests::RefreshService.prepend_mod_with('MergeRequests::RefreshService')
diff --git a/app/services/merge_requests/remove_approval_service.rb b/app/services/merge_requests/remove_approval_service.rb
index f2bf5de61c1..872e7e0c89c 100644
--- a/app/services/merge_requests/remove_approval_service.rb
+++ b/app/services/merge_requests/remove_approval_service.rb
@@ -41,4 +41,4 @@ module MergeRequests
end
end
-MergeRequests::RemoveApprovalService.prepend_if_ee('EE::MergeRequests::RemoveApprovalService')
+MergeRequests::RemoveApprovalService.prepend_mod_with('MergeRequests::RemoveApprovalService')
diff --git a/app/services/merge_requests/update_assignees_service.rb b/app/services/merge_requests/update_assignees_service.rb
index b339a644e8c..91797c31e85 100644
--- a/app/services/merge_requests/update_assignees_service.rb
+++ b/app/services/merge_requests/update_assignees_service.rb
@@ -61,4 +61,4 @@ module MergeRequests
end
end
-MergeRequests::UpdateAssigneesService.prepend_if_ee('EE::MergeRequests::UpdateAssigneesService')
+MergeRequests::UpdateAssigneesService.prepend_mod_with('MergeRequests::UpdateAssigneesService')
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb
index 016d8efe218..9522bdc7419 100644
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
@@ -313,4 +313,4 @@ module MergeRequests
end
end
-MergeRequests::UpdateService.prepend_if_ee('EE::MergeRequests::UpdateService')
+MergeRequests::UpdateService.prepend_mod_with('MergeRequests::UpdateService')
diff --git a/app/services/milestones/promote_service.rb b/app/services/milestones/promote_service.rb
index 2431318cbb2..4417f17f33e 100644
--- a/app/services/milestones/promote_service.rb
+++ b/app/services/milestones/promote_service.rb
@@ -90,4 +90,4 @@ module Milestones
end
end
-Milestones::PromoteService.prepend_if_ee('EE::Milestones::PromoteService')
+Milestones::PromoteService.prepend_mod_with('Milestones::PromoteService')
diff --git a/app/services/milestones/update_service.rb b/app/services/milestones/update_service.rb
index 782c6bc3e35..b9a12a35d31 100644
--- a/app/services/milestones/update_service.rb
+++ b/app/services/milestones/update_service.rb
@@ -21,4 +21,4 @@ module Milestones
end
end
-Milestones::UpdateService.prepend_if_ee('EE::Milestones::UpdateService')
+Milestones::UpdateService.prepend_mod_with('Milestones::UpdateService')
diff --git a/app/services/namespace_settings/update_service.rb b/app/services/namespace_settings/update_service.rb
index c6c04b63690..de54eb87cc0 100644
--- a/app/services/namespace_settings/update_service.rb
+++ b/app/services/namespace_settings/update_service.rb
@@ -35,4 +35,4 @@ module NamespaceSettings
end
end
-NamespaceSettings::UpdateService.prepend_if_ee('EE::NamespaceSettings::UpdateService')
+NamespaceSettings::UpdateService.prepend_mod_with('NamespaceSettings::UpdateService')
diff --git a/app/services/namespaces/in_product_marketing_emails_service.rb b/app/services/namespaces/in_product_marketing_emails_service.rb
index 3ddb4535bae..61d5ed3bdf4 100644
--- a/app/services/namespaces/in_product_marketing_emails_service.rb
+++ b/app/services/namespaces/in_product_marketing_emails_service.rb
@@ -145,4 +145,4 @@ module Namespaces
end
end
-Namespaces::InProductMarketingEmailsService.prepend_ee_mod
+Namespaces::InProductMarketingEmailsService.prepend_mod
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index e63099a0820..542fafb901b 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -133,4 +133,4 @@ module Notes
end
end
-Notes::CreateService.prepend_if_ee('EE::Notes::CreateService')
+Notes::CreateService.prepend_mod_with('Notes::CreateService')
diff --git a/app/services/notes/destroy_service.rb b/app/services/notes/destroy_service.rb
index 85f54a39add..c25b1ab0379 100644
--- a/app/services/notes/destroy_service.rb
+++ b/app/services/notes/destroy_service.rb
@@ -24,4 +24,4 @@ module Notes
end
end
-Notes::DestroyService.prepend_if_ee('EE::Notes::DestroyService')
+Notes::DestroyService.prepend_mod_with('Notes::DestroyService')
diff --git a/app/services/notes/post_process_service.rb b/app/services/notes/post_process_service.rb
index 4f3b2000e9a..b7ccdbc1cff 100644
--- a/app/services/notes/post_process_service.rb
+++ b/app/services/notes/post_process_service.rb
@@ -44,4 +44,4 @@ module Notes
end
end
-Notes::PostProcessService.prepend_if_ee('EE::Notes::PostProcessService')
+Notes::PostProcessService.prepend_mod_with('Notes::PostProcessService')
diff --git a/app/services/notes/quick_actions_service.rb b/app/services/notes/quick_actions_service.rb
index 36d9f1d7867..4bcd2586788 100644
--- a/app/services/notes/quick_actions_service.rb
+++ b/app/services/notes/quick_actions_service.rb
@@ -60,4 +60,4 @@ module Notes
end
end
-Notes::QuickActionsService.prepend_if_ee('EE::Notes::QuickActionsService')
+Notes::QuickActionsService.prepend_mod_with('Notes::QuickActionsService')
diff --git a/app/services/notes/update_service.rb b/app/services/notes/update_service.rb
index 76f9b6369b3..1cbb5916107 100644
--- a/app/services/notes/update_service.rb
+++ b/app/services/notes/update_service.rb
@@ -107,4 +107,4 @@ module Notes
end
end
-Notes::UpdateService.prepend_if_ee('EE::Notes::UpdateService')
+Notes::UpdateService.prepend_mod_with('Notes::UpdateService')
diff --git a/app/services/notification_recipients/builder/default.rb b/app/services/notification_recipients/builder/default.rb
index 19527ba84e6..58b0cd510c9 100644
--- a/app/services/notification_recipients/builder/default.rb
+++ b/app/services/notification_recipients/builder/default.rb
@@ -74,4 +74,4 @@ module NotificationRecipients
end
end
-NotificationRecipients::Builder::Default.prepend_if_ee('EE::NotificationRecipients::Builder::Default')
+NotificationRecipients::Builder::Default.prepend_mod_with('NotificationRecipients::Builder::Default')
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 8662012afdf..9dfcfe748da 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -876,4 +876,4 @@ class NotificationService
end
end
-NotificationService.prepend_if_ee('EE::NotificationService')
+NotificationService.prepend_mod_with('NotificationService')
diff --git a/app/services/personal_access_tokens/create_service.rb b/app/services/personal_access_tokens/create_service.rb
index 93a0135669f..7555ba26768 100644
--- a/app/services/personal_access_tokens/create_service.rb
+++ b/app/services/personal_access_tokens/create_service.rb
@@ -45,4 +45,4 @@ module PersonalAccessTokens
end
end
-PersonalAccessTokens::CreateService.prepend_if_ee('EE::PersonalAccessTokens::CreateService')
+PersonalAccessTokens::CreateService.prepend_mod_with('PersonalAccessTokens::CreateService')
diff --git a/app/services/personal_access_tokens/revoke_service.rb b/app/services/personal_access_tokens/revoke_service.rb
index 34d542acab1..0275d03bcc9 100644
--- a/app/services/personal_access_tokens/revoke_service.rb
+++ b/app/services/personal_access_tokens/revoke_service.rb
@@ -41,4 +41,4 @@ module PersonalAccessTokens
end
end
-PersonalAccessTokens::RevokeService.prepend_if_ee('EE::PersonalAccessTokens::RevokeService')
+PersonalAccessTokens::RevokeService.prepend_mod_with('PersonalAccessTokens::RevokeService')
diff --git a/app/services/post_receive_service.rb b/app/services/post_receive_service.rb
index 3dc8fd8929a..8d5cd82bcac 100644
--- a/app/services/post_receive_service.rb
+++ b/app/services/post_receive_service.rb
@@ -98,4 +98,4 @@ class PostReceiveService
end
end
-PostReceiveService.prepend_if_ee('EE::PostReceiveService')
+PostReceiveService.prepend_mod_with('PostReceiveService')
diff --git a/app/services/preview_markdown_service.rb b/app/services/preview_markdown_service.rb
index afe2651b11a..af9c338b59e 100644
--- a/app/services/preview_markdown_service.rb
+++ b/app/services/preview_markdown_service.rb
@@ -68,4 +68,4 @@ class PreviewMarkdownService < BaseService
end
end
-PreviewMarkdownService.prepend_if_ee('EE::PreviewMarkdownService')
+PreviewMarkdownService.prepend_mod_with('PreviewMarkdownService')
diff --git a/app/services/projects/after_rename_service.rb b/app/services/projects/after_rename_service.rb
index 054b358c58a..6d389035922 100644
--- a/app/services/projects/after_rename_service.rb
+++ b/app/services/projects/after_rename_service.rb
@@ -147,4 +147,4 @@ module Projects
end
end
-Projects::AfterRenameService.prepend_if_ee('EE::Projects::AfterRenameService')
+Projects::AfterRenameService.prepend_mod_with('Projects::AfterRenameService')
diff --git a/app/services/projects/autocomplete_service.rb b/app/services/projects/autocomplete_service.rb
index 68086f636b7..55f16aa3e3d 100644
--- a/app/services/projects/autocomplete_service.rb
+++ b/app/services/projects/autocomplete_service.rb
@@ -39,4 +39,4 @@ module Projects
end
end
-Projects::AutocompleteService.prepend_if_ee('EE::Projects::AutocompleteService')
+Projects::AutocompleteService.prepend_mod_with('Projects::AutocompleteService')
diff --git a/app/services/projects/cleanup_service.rb b/app/services/projects/cleanup_service.rb
index 7bcaee75813..5eafa5f9b29 100644
--- a/app/services/projects/cleanup_service.rb
+++ b/app/services/projects/cleanup_service.rb
@@ -108,4 +108,4 @@ module Projects
end
end
-Projects::CleanupService.prepend_if_ee('EE::Projects::CleanupService')
+Projects::CleanupService.prepend_mod_with('Projects::CleanupService')
diff --git a/app/services/projects/create_from_template_service.rb b/app/services/projects/create_from_template_service.rb
index 3c66ff709c9..48dda09da71 100644
--- a/app/services/projects/create_from_template_service.rb
+++ b/app/services/projects/create_from_template_service.rb
@@ -58,4 +58,4 @@ module Projects
end
end
-Projects::CreateFromTemplateService.prepend_if_ee('EE::Projects::CreateFromTemplateService')
+Projects::CreateFromTemplateService.prepend_mod_with('Projects::CreateFromTemplateService')
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 3a1fadc68c3..54a4a02a196 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -264,7 +264,7 @@ module Projects
end
end
-Projects::CreateService.prepend_if_ee('EE::Projects::CreateService')
+Projects::CreateService.prepend_mod_with('Projects::CreateService')
# Measurable should be at the bottom of the ancestor chain, so it will measure execution of EE::Projects::CreateService as well
Projects::CreateService.prepend(Measurable)
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index 387a2d66094..0682f3013d4 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -183,4 +183,4 @@ module Projects
end
end
-Projects::DestroyService.prepend_if_ee('EE::Projects::DestroyService')
+Projects::DestroyService.prepend_mod_with('Projects::DestroyService')
diff --git a/app/services/projects/disable_deploy_key_service.rb b/app/services/projects/disable_deploy_key_service.rb
index 9fb2e3398b2..e0f309875de 100644
--- a/app/services/projects/disable_deploy_key_service.rb
+++ b/app/services/projects/disable_deploy_key_service.rb
@@ -12,4 +12,4 @@ module Projects
end
end
-Projects::DisableDeployKeyService.prepend_if_ee('EE::Projects::DisableDeployKeyService')
+Projects::DisableDeployKeyService.prepend_mod_with('Projects::DisableDeployKeyService')
diff --git a/app/services/projects/enable_deploy_key_service.rb b/app/services/projects/enable_deploy_key_service.rb
index 0a24137bd61..581a6cc0ade 100644
--- a/app/services/projects/enable_deploy_key_service.rb
+++ b/app/services/projects/enable_deploy_key_service.rb
@@ -27,4 +27,4 @@ module Projects
end
end
-Projects::EnableDeployKeyService.prepend_if_ee('EE::Projects::EnableDeployKeyService')
+Projects::EnableDeployKeyService.prepend_mod_with('Projects::EnableDeployKeyService')
diff --git a/app/services/projects/gitlab_projects_import_service.rb b/app/services/projects/gitlab_projects_import_service.rb
index 38f0e2f7c1a..63a41d172ea 100644
--- a/app/services/projects/gitlab_projects_import_service.rb
+++ b/app/services/projects/gitlab_projects_import_service.rb
@@ -77,4 +77,4 @@ module Projects
end
end
-Projects::GitlabProjectsImportService.prepend_if_ee('EE::Projects::GitlabProjectsImportService')
+Projects::GitlabProjectsImportService.prepend_mod_with('Projects::GitlabProjectsImportService')
diff --git a/app/services/projects/group_links/create_service.rb b/app/services/projects/group_links/create_service.rb
index 3262839e246..d8fa2f36fcc 100644
--- a/app/services/projects/group_links/create_service.rb
+++ b/app/services/projects/group_links/create_service.rb
@@ -44,4 +44,4 @@ module Projects
end
end
-Projects::GroupLinks::CreateService.prepend_if_ee('EE::Projects::GroupLinks::CreateService')
+Projects::GroupLinks::CreateService.prepend_mod_with('Projects::GroupLinks::CreateService')
diff --git a/app/services/projects/group_links/destroy_service.rb b/app/services/projects/group_links/destroy_service.rb
index 229191e41f6..bfe704cd780 100644
--- a/app/services/projects/group_links/destroy_service.rb
+++ b/app/services/projects/group_links/destroy_service.rb
@@ -20,4 +20,4 @@ module Projects
end
end
-Projects::GroupLinks::DestroyService.prepend_if_ee('EE::Projects::GroupLinks::DestroyService')
+Projects::GroupLinks::DestroyService.prepend_mod_with('Projects::GroupLinks::DestroyService')
diff --git a/app/services/projects/hashed_storage/migrate_attachments_service.rb b/app/services/projects/hashed_storage/migrate_attachments_service.rb
index 3d9d03c4a95..023f8494d99 100644
--- a/app/services/projects/hashed_storage/migrate_attachments_service.rb
+++ b/app/services/projects/hashed_storage/migrate_attachments_service.rb
@@ -64,4 +64,4 @@ module Projects
end
end
-Projects::HashedStorage::MigrateAttachmentsService.prepend_if_ee('EE::Projects::HashedStorage::MigrateAttachmentsService')
+Projects::HashedStorage::MigrateAttachmentsService.prepend_mod_with('Projects::HashedStorage::MigrateAttachmentsService')
diff --git a/app/services/projects/hashed_storage/migrate_repository_service.rb b/app/services/projects/hashed_storage/migrate_repository_service.rb
index adc7e38e4d5..c7989e04607 100644
--- a/app/services/projects/hashed_storage/migrate_repository_service.rb
+++ b/app/services/projects/hashed_storage/migrate_repository_service.rb
@@ -52,4 +52,4 @@ module Projects
end
end
-Projects::HashedStorage::MigrateRepositoryService.prepend_if_ee('EE::Projects::HashedStorage::MigrateRepositoryService')
+Projects::HashedStorage::MigrateRepositoryService.prepend_mod_with('Projects::HashedStorage::MigrateRepositoryService')
diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb
index 9879ffde60a..b5288aad6f0 100644
--- a/app/services/projects/import_service.rb
+++ b/app/services/projects/import_service.rb
@@ -149,7 +149,7 @@ module Projects
end
end
-Projects::ImportService.prepend_if_ee('EE::Projects::ImportService')
+Projects::ImportService.prepend_mod_with('Projects::ImportService')
# Measurable should be at the bottom of the ancestor chain, so it will measure execution of EE::Projects::ImportService as well
Projects::ImportService.prepend(Measurable)
diff --git a/app/services/projects/operations/update_service.rb b/app/services/projects/operations/update_service.rb
index 7dfe7fffa1b..c0734171ee5 100644
--- a/app/services/projects/operations/update_service.rb
+++ b/app/services/projects/operations/update_service.rb
@@ -135,4 +135,4 @@ module Projects
end
end
-Projects::Operations::UpdateService.prepend_if_ee('::EE::Projects::Operations::UpdateService')
+Projects::Operations::UpdateService.prepend_mod_with('Projects::Operations::UpdateService')
diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index db4c022bdd4..0b7169d730f 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -229,4 +229,4 @@ module Projects
end
end
-Projects::TransferService.prepend_if_ee('EE::Projects::TransferService')
+Projects::TransferService.prepend_mod_with('Projects::TransferService')
diff --git a/app/services/projects/update_pages_service.rb b/app/services/projects/update_pages_service.rb
index 1ecf4beb7e2..8ea35131339 100644
--- a/app/services/projects/update_pages_service.rb
+++ b/app/services/projects/update_pages_service.rb
@@ -267,4 +267,4 @@ module Projects
end
end
-Projects::UpdatePagesService.prepend_if_ee('EE::Projects::UpdatePagesService')
+Projects::UpdatePagesService.prepend_mod_with('Projects::UpdatePagesService')
diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb
index 454a80623c6..541b333aae3 100644
--- a/app/services/projects/update_service.rb
+++ b/app/services/projects/update_service.rb
@@ -170,4 +170,4 @@ module Projects
end
end
-Projects::UpdateService.prepend_if_ee('EE::Projects::UpdateService')
+Projects::UpdateService.prepend_mod_with('Projects::UpdateService')
diff --git a/app/services/protected_branches/access_level_params.rb b/app/services/protected_branches/access_level_params.rb
index e34bc23b4dc..6f7a289d9b4 100644
--- a/app/services/protected_branches/access_level_params.rb
+++ b/app/services/protected_branches/access_level_params.rb
@@ -34,4 +34,4 @@ module ProtectedBranches
end
end
-ProtectedBranches::AccessLevelParams.prepend_if_ee('EE::ProtectedBranches::AccessLevelParams')
+ProtectedBranches::AccessLevelParams.prepend_mod_with('ProtectedBranches::AccessLevelParams')
diff --git a/app/services/protected_branches/api_service.rb b/app/services/protected_branches/api_service.rb
index bf1a966472b..3e5122a1523 100644
--- a/app/services/protected_branches/api_service.rb
+++ b/app/services/protected_branches/api_service.rb
@@ -21,4 +21,4 @@ module ProtectedBranches
end
end
-ProtectedBranches::ApiService.prepend_if_ee('EE::ProtectedBranches::ApiService')
+ProtectedBranches::ApiService.prepend_mod_with('ProtectedBranches::ApiService')
diff --git a/app/services/protected_branches/create_service.rb b/app/services/protected_branches/create_service.rb
index 3c86d7d087d..37083a4a9e4 100644
--- a/app/services/protected_branches/create_service.rb
+++ b/app/services/protected_branches/create_service.rb
@@ -26,4 +26,4 @@ module ProtectedBranches
end
end
-ProtectedBranches::CreateService.prepend_if_ee('EE::ProtectedBranches::CreateService')
+ProtectedBranches::CreateService.prepend_mod_with('ProtectedBranches::CreateService')
diff --git a/app/services/protected_branches/destroy_service.rb b/app/services/protected_branches/destroy_service.rb
index acd15b0214f..dc177f0ac09 100644
--- a/app/services/protected_branches/destroy_service.rb
+++ b/app/services/protected_branches/destroy_service.rb
@@ -10,4 +10,4 @@ module ProtectedBranches
end
end
-ProtectedBranches::DestroyService.prepend_if_ee('EE::ProtectedBranches::DestroyService')
+ProtectedBranches::DestroyService.prepend_mod_with('ProtectedBranches::DestroyService')
diff --git a/app/services/protected_branches/legacy_api_update_service.rb b/app/services/protected_branches/legacy_api_update_service.rb
index 0cad23f20f7..8ff6c4bd734 100644
--- a/app/services/protected_branches/legacy_api_update_service.rb
+++ b/app/services/protected_branches/legacy_api_update_service.rb
@@ -49,4 +49,4 @@ module ProtectedBranches
end
end
-ProtectedBranches::LegacyApiUpdateService.prepend_if_ee('EE::ProtectedBranches::LegacyApiUpdateService')
+ProtectedBranches::LegacyApiUpdateService.prepend_mod_with('ProtectedBranches::LegacyApiUpdateService')
diff --git a/app/services/protected_branches/update_service.rb b/app/services/protected_branches/update_service.rb
index 226aefb64d0..1815d92421e 100644
--- a/app/services/protected_branches/update_service.rb
+++ b/app/services/protected_branches/update_service.rb
@@ -11,4 +11,4 @@ module ProtectedBranches
end
end
-ProtectedBranches::UpdateService.prepend_if_ee('EE::ProtectedBranches::UpdateService')
+ProtectedBranches::UpdateService.prepend_mod_with('ProtectedBranches::UpdateService')
diff --git a/app/services/quick_actions/interpret_service.rb b/app/services/quick_actions/interpret_service.rb
index ea90d8e3dd8..ab489ba49ca 100644
--- a/app/services/quick_actions/interpret_service.rb
+++ b/app/services/quick_actions/interpret_service.rb
@@ -190,4 +190,4 @@ module QuickActions
end
end
-QuickActions::InterpretService.prepend_if_ee('EE::QuickActions::InterpretService')
+QuickActions::InterpretService.prepend_mod_with('QuickActions::InterpretService')
diff --git a/app/services/quick_actions/target_service.rb b/app/services/quick_actions/target_service.rb
index a465632ccfb..6eda3c89e6c 100644
--- a/app/services/quick_actions/target_service.rb
+++ b/app/services/quick_actions/target_service.rb
@@ -37,4 +37,4 @@ module QuickActions
end
end
-QuickActions::TargetService.prepend_if_ee('EE::QuickActions::TargetService')
+QuickActions::TargetService.prepend_mod_with('QuickActions::TargetService')
diff --git a/app/services/releases/base_service.rb b/app/services/releases/base_service.rb
index de7c97b3518..9dd0c9a007a 100644
--- a/app/services/releases/base_service.rb
+++ b/app/services/releases/base_service.rb
@@ -86,4 +86,4 @@ module Releases
end
end
-Releases::BaseService.prepend_if_ee('EE::Releases::BaseService')
+Releases::BaseService.prepend_mod_with('Releases::BaseService')
diff --git a/app/services/releases/create_evidence_service.rb b/app/services/releases/create_evidence_service.rb
index 78b6d77c2cb..64cce45e400 100644
--- a/app/services/releases/create_evidence_service.rb
+++ b/app/services/releases/create_evidence_service.rb
@@ -28,4 +28,4 @@ module Releases
end
end
-Releases::CreateEvidenceService.prepend_if_ee('EE::Releases::CreateEvidenceService')
+Releases::CreateEvidenceService.prepend_mod_with('Releases::CreateEvidenceService')
diff --git a/app/services/resource_access_tokens/create_service.rb b/app/services/resource_access_tokens/create_service.rb
index 620dfff91e2..84f4478f20f 100644
--- a/app/services/resource_access_tokens/create_service.rb
+++ b/app/services/resource_access_tokens/create_service.rb
@@ -120,4 +120,4 @@ module ResourceAccessTokens
end
end
-ResourceAccessTokens::CreateService.prepend_if_ee('EE::ResourceAccessTokens::CreateService')
+ResourceAccessTokens::CreateService.prepend_mod_with('ResourceAccessTokens::CreateService')
diff --git a/app/services/resource_access_tokens/revoke_service.rb b/app/services/resource_access_tokens/revoke_service.rb
index 0924ca3bac4..9543ea4b68d 100644
--- a/app/services/resource_access_tokens/revoke_service.rb
+++ b/app/services/resource_access_tokens/revoke_service.rb
@@ -67,4 +67,4 @@ module ResourceAccessTokens
end
end
-ResourceAccessTokens::RevokeService.prepend_if_ee('EE::ResourceAccessTokens::RevokeService')
+ResourceAccessTokens::RevokeService.prepend_mod_with('ResourceAccessTokens::RevokeService')
diff --git a/app/services/resource_events/change_labels_service.rb b/app/services/resource_events/change_labels_service.rb
index 89eb90e9360..3797d41a5df 100644
--- a/app/services/resource_events/change_labels_service.rb
+++ b/app/services/resource_events/change_labels_service.rb
@@ -44,4 +44,4 @@ module ResourceEvents
end
end
-ResourceEvents::ChangeLabelsService.prepend_if_ee('EE::ResourceEvents::ChangeLabelsService')
+ResourceEvents::ChangeLabelsService.prepend_mod_with('ResourceEvents::ChangeLabelsService')
diff --git a/app/services/resource_events/merge_into_notes_service.rb b/app/services/resource_events/merge_into_notes_service.rb
index 122bcb8550f..ea465c1e75e 100644
--- a/app/services/resource_events/merge_into_notes_service.rb
+++ b/app/services/resource_events/merge_into_notes_service.rb
@@ -37,4 +37,4 @@ module ResourceEvents
end
end
-ResourceEvents::MergeIntoNotesService.prepend_if_ee('EE::ResourceEvents::MergeIntoNotesService')
+ResourceEvents::MergeIntoNotesService.prepend_mod_with('ResourceEvents::MergeIntoNotesService')
diff --git a/app/services/search/global_service.rb b/app/services/search/global_service.rb
index 055034d87a1..661aafc70cd 100644
--- a/app/services/search/global_service.rb
+++ b/app/services/search/global_service.rb
@@ -38,4 +38,4 @@ module Search
end
end
-Search::GlobalService.prepend_if_ee('EE::Search::GlobalService')
+Search::GlobalService.prepend_mod_with('Search::GlobalService')
diff --git a/app/services/search/group_service.rb b/app/services/search/group_service.rb
index 4b2d8499582..daed0df83f3 100644
--- a/app/services/search/group_service.rb
+++ b/app/services/search/group_service.rb
@@ -31,4 +31,4 @@ module Search
end
end
-Search::GroupService.prepend_if_ee('EE::Search::GroupService')
+Search::GroupService.prepend_mod_with('Search::GroupService')
diff --git a/app/services/search/project_service.rb b/app/services/search/project_service.rb
index 4227dfe2fac..3181c0098cc 100644
--- a/app/services/search/project_service.rb
+++ b/app/services/search/project_service.rb
@@ -37,4 +37,4 @@ module Search
end
end
-Search::ProjectService.prepend_if_ee('EE::Search::ProjectService')
+Search::ProjectService.prepend_mod_with('Search::ProjectService')
diff --git a/app/services/search/snippet_service.rb b/app/services/search/snippet_service.rb
index 30401b28571..b629fd305d7 100644
--- a/app/services/search/snippet_service.rb
+++ b/app/services/search/snippet_service.rb
@@ -12,4 +12,4 @@ module Search
end
end
-Search::SnippetService.prepend_if_ee('::EE::Search::SnippetService')
+Search::SnippetService.prepend_mod_with('Search::SnippetService')
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index 84d7e33c3d0..389cf17e115 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -140,4 +140,4 @@ class SearchService
attr_reader :current_user, :params
end
-SearchService.prepend_if_ee('EE::SearchService')
+SearchService.prepend_mod_with('SearchService')
diff --git a/app/services/snippets/destroy_service.rb b/app/services/snippets/destroy_service.rb
index 9bd74306cab..96157434462 100644
--- a/app/services/snippets/destroy_service.rb
+++ b/app/services/snippets/destroy_service.rb
@@ -59,4 +59,4 @@ module Snippets
end
end
-Snippets::DestroyService.prepend_if_ee('EE::Snippets::DestroyService')
+Snippets::DestroyService.prepend_mod_with('Snippets::DestroyService')
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 4377bd8554b..56a6244eebf 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -338,4 +338,4 @@ module SystemNoteService
end
end
-SystemNoteService.prepend_if_ee('EE::SystemNoteService')
+SystemNoteService.prepend_mod_with('SystemNoteService')
diff --git a/app/services/system_notes/issuables_service.rb b/app/services/system_notes/issuables_service.rb
index a44a3d3f1b9..ae4f65e785c 100644
--- a/app/services/system_notes/issuables_service.rb
+++ b/app/services/system_notes/issuables_service.rb
@@ -420,4 +420,4 @@ module SystemNotes
end
end
-SystemNotes::IssuablesService.prepend_if_ee('::EE::SystemNotes::IssuablesService')
+SystemNotes::IssuablesService.prepend_mod_with('SystemNotes::IssuablesService')
diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb
index 68e2af93be1..fc6543a8efc 100644
--- a/app/services/todo_service.rb
+++ b/app/services/todo_service.rb
@@ -371,4 +371,4 @@ class TodoService
end
end
-TodoService.prepend_if_ee('EE::TodoService')
+TodoService.prepend_mod_with('TodoService')
diff --git a/app/services/todos/destroy/entity_leave_service.rb b/app/services/todos/destroy/entity_leave_service.rb
index 94f8926f93f..dfe14225ade 100644
--- a/app/services/todos/destroy/entity_leave_service.rb
+++ b/app/services/todos/destroy/entity_leave_service.rb
@@ -143,4 +143,4 @@ module Todos
end
end
-Todos::Destroy::EntityLeaveService.prepend_if_ee('EE::Todos::Destroy::EntityLeaveService')
+Todos::Destroy::EntityLeaveService.prepend_mod_with('Todos::Destroy::EntityLeaveService')
diff --git a/app/services/user_project_access_changed_service.rb b/app/services/user_project_access_changed_service.rb
index 11727f05f35..80490bd4c9a 100644
--- a/app/services/user_project_access_changed_service.rb
+++ b/app/services/user_project_access_changed_service.rb
@@ -26,4 +26,4 @@ class UserProjectAccessChangedService
end
end
-UserProjectAccessChangedService.prepend_if_ee('EE::UserProjectAccessChangedService')
+UserProjectAccessChangedService.prepend_mod_with('UserProjectAccessChangedService')
diff --git a/app/services/users/activity_service.rb b/app/services/users/activity_service.rb
index 64844a3f002..c89a286cc8b 100644
--- a/app/services/users/activity_service.rb
+++ b/app/services/users/activity_service.rb
@@ -38,4 +38,4 @@ module Users
end
end
-Users::ActivityService.prepend_ee_mod
+Users::ActivityService.prepend_mod
diff --git a/app/services/users/approve_service.rb b/app/services/users/approve_service.rb
index fea7fc55d90..15486ddcd43 100644
--- a/app/services/users/approve_service.rb
+++ b/app/services/users/approve_service.rb
@@ -47,4 +47,4 @@ module Users
end
end
-Users::ApproveService.prepend_if_ee('EE::Users::ApproveService')
+Users::ApproveService.prepend_mod_with('Users::ApproveService')
diff --git a/app/services/users/block_service.rb b/app/services/users/block_service.rb
index 8513664ee85..37921c477b4 100644
--- a/app/services/users/block_service.rb
+++ b/app/services/users/block_service.rb
@@ -26,4 +26,4 @@ module Users
end
end
-Users::BlockService.prepend_if_ee('EE::Users::BlockService')
+Users::BlockService.prepend_mod_with('Users::BlockService')
diff --git a/app/services/users/build_service.rb b/app/services/users/build_service.rb
index c49e39300d4..649cf281ab0 100644
--- a/app/services/users/build_service.rb
+++ b/app/services/users/build_service.rb
@@ -162,4 +162,4 @@ module Users
end
end
-Users::BuildService.prepend_if_ee('EE::Users::BuildService')
+Users::BuildService.prepend_mod_with('Users::BuildService')
diff --git a/app/services/users/create_service.rb b/app/services/users/create_service.rb
index ec8b3cea664..757ebd783ee 100644
--- a/app/services/users/create_service.rb
+++ b/app/services/users/create_service.rb
@@ -26,4 +26,4 @@ module Users
end
end
-Users::CreateService.prepend_if_ee('EE::Users::CreateService')
+Users::CreateService.prepend_mod_with('Users::CreateService')
diff --git a/app/services/users/destroy_service.rb b/app/services/users/destroy_service.rb
index 63a02ebede5..4ec875098fa 100644
--- a/app/services/users/destroy_service.rb
+++ b/app/services/users/destroy_service.rb
@@ -73,4 +73,4 @@ module Users
end
end
-Users::DestroyService.prepend_if_ee('EE::Users::DestroyService')
+Users::DestroyService.prepend_mod_with('Users::DestroyService')
diff --git a/app/services/users/migrate_to_ghost_user_service.rb b/app/services/users/migrate_to_ghost_user_service.rb
index 1b46edd4d7d..a471f55e644 100644
--- a/app/services/users/migrate_to_ghost_user_service.rb
+++ b/app/services/users/migrate_to_ghost_user_service.rb
@@ -93,4 +93,4 @@ module Users
end
end
-Users::MigrateToGhostUserService.prepend_if_ee('EE::Users::MigrateToGhostUserService')
+Users::MigrateToGhostUserService.prepend_mod_with('Users::MigrateToGhostUserService')
diff --git a/app/services/users/reject_service.rb b/app/services/users/reject_service.rb
index 0e3eb3e5dde..833c30d9427 100644
--- a/app/services/users/reject_service.rb
+++ b/app/services/users/reject_service.rb
@@ -39,4 +39,4 @@ module Users
end
end
-Users::RejectService.prepend_if_ee('EE::Users::RejectService')
+Users::RejectService.prepend_mod_with('Users::RejectService')
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index ef68fb9a537..ff08c806319 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -96,4 +96,4 @@ module Users
end
end
-Users::UpdateService.prepend_if_ee('EE::Users::UpdateService')
+Users::UpdateService.prepend_mod_with('Users::UpdateService')
diff --git a/app/services/wiki_pages/base_service.rb b/app/services/wiki_pages/base_service.rb
index fd234630633..4ec884469eb 100644
--- a/app/services/wiki_pages/base_service.rb
+++ b/app/services/wiki_pages/base_service.rb
@@ -61,4 +61,4 @@ module WikiPages
end
end
-WikiPages::BaseService.prepend_if_ee('EE::WikiPages::BaseService')
+WikiPages::BaseService.prepend_mod_with('WikiPages::BaseService')
diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb
index 44f8e6b0e28..be5839b7ec5 100644
--- a/app/uploaders/object_storage.rb
+++ b/app/uploaders/object_storage.rb
@@ -508,4 +508,4 @@ module ObjectStorage
end
end
-ObjectStorage::Concern.include_if_ee('::EE::ObjectStorage::Concern')
+ObjectStorage::Concern.include_mod_with('ObjectStorage::Concern')
diff --git a/app/validators/json_schema_validator.rb b/app/validators/json_schema_validator.rb
index 8dc6265f471..68f03e8a6a3 100644
--- a/app/validators/json_schema_validator.rb
+++ b/app/validators/json_schema_validator.rb
@@ -54,4 +54,4 @@ class JsonSchemaValidator < ActiveModel::EachValidator
end
end
-JsonSchemaValidator.prepend_ee_mod
+JsonSchemaValidator.prepend_mod
diff --git a/app/workers/build_finished_worker.rb b/app/workers/build_finished_worker.rb
index 6cab70405d2..a3eaacec8a2 100644
--- a/app/workers/build_finished_worker.rb
+++ b/app/workers/build_finished_worker.rb
@@ -58,4 +58,4 @@ class BuildFinishedWorker # rubocop:disable Scalability/IdempotentWorker
end
end
-BuildFinishedWorker.prepend_if_ee('EE::BuildFinishedWorker')
+BuildFinishedWorker.prepend_mod_with('BuildFinishedWorker')
diff --git a/app/workers/issuable_export_csv_worker.rb b/app/workers/issuable_export_csv_worker.rb
index 3513e5a84f1..41facab6bb9 100644
--- a/app/workers/issuable_export_csv_worker.rb
+++ b/app/workers/issuable_export_csv_worker.rb
@@ -49,4 +49,4 @@ class IssuableExportCsvWorker # rubocop:disable Scalability/IdempotentWorker
end
end
-IssuableExportCsvWorker.prepend_if_ee('::EE::IssuableExportCsvWorker')
+IssuableExportCsvWorker.prepend_mod_with('IssuableExportCsvWorker')
diff --git a/app/workers/namespaces/in_product_marketing_emails_worker.rb b/app/workers/namespaces/in_product_marketing_emails_worker.rb
index 0aab7039844..7985325d1ad 100644
--- a/app/workers/namespaces/in_product_marketing_emails_worker.rb
+++ b/app/workers/namespaces/in_product_marketing_emails_worker.rb
@@ -35,4 +35,4 @@ module Namespaces
end
end
-Namespaces::InProductMarketingEmailsWorker.prepend_if_ee('EE::Namespaces::InProductMarketingEmailsWorker')
+Namespaces::InProductMarketingEmailsWorker.prepend_mod_with('Namespaces::InProductMarketingEmailsWorker')
diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb
index 222510c81d0..ce985492935 100644
--- a/app/workers/post_receive.rb
+++ b/app/workers/post_receive.rb
@@ -136,4 +136,4 @@ class PostReceive # rubocop:disable Scalability/IdempotentWorker
end
end
-PostReceive.prepend_if_ee('EE::PostReceive')
+PostReceive.prepend_mod_with('PostReceive')
diff --git a/app/workers/project_cache_worker.rb b/app/workers/project_cache_worker.rb
index 01e76d22975..d2796cdb697 100644
--- a/app/workers/project_cache_worker.rb
+++ b/app/workers/project_cache_worker.rb
@@ -63,4 +63,4 @@ class ProjectCacheWorker
end
end
-ProjectCacheWorker.prepend_if_ee('EE::ProjectCacheWorker')
+ProjectCacheWorker.prepend_mod_with('ProjectCacheWorker')
diff --git a/app/workers/repository_check/batch_worker.rb b/app/workers/repository_check/batch_worker.rb
index 88b40c3b4d1..a8744638d7b 100644
--- a/app/workers/repository_check/batch_worker.rb
+++ b/app/workers/repository_check/batch_worker.rb
@@ -97,4 +97,4 @@ module RepositoryCheck
end
end
-RepositoryCheck::BatchWorker.prepend_if_ee('::EE::RepositoryCheck::BatchWorker')
+RepositoryCheck::BatchWorker.prepend_mod_with('RepositoryCheck::BatchWorker')
diff --git a/app/workers/repository_check/single_repository_worker.rb b/app/workers/repository_check/single_repository_worker.rb
index 153ad087a5f..a9a8201205e 100644
--- a/app/workers/repository_check/single_repository_worker.rb
+++ b/app/workers/repository_check/single_repository_worker.rb
@@ -69,4 +69,4 @@ module RepositoryCheck
end
end
-RepositoryCheck::SingleRepositoryWorker.prepend_if_ee('::EE::RepositoryCheck::SingleRepositoryWorker')
+RepositoryCheck::SingleRepositoryWorker.prepend_mod_with('RepositoryCheck::SingleRepositoryWorker')
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb
index 90764d7374d..0f86d55df22 100644
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
@@ -63,4 +63,4 @@ class RepositoryImportWorker # rubocop:disable Scalability/IdempotentWorker
end
end
-RepositoryImportWorker.prepend_if_ee('EE::RepositoryImportWorker')
+RepositoryImportWorker.prepend_mod_with('RepositoryImportWorker')
diff --git a/config/initializers/0_inject_enterprise_edition_module.rb b/config/initializers/0_inject_enterprise_edition_module.rb
index 5f938c1ef37..ea3fbda9186 100644
--- a/config/initializers/0_inject_enterprise_edition_module.rb
+++ b/config/initializers/0_inject_enterprise_edition_module.rb
@@ -3,50 +3,40 @@
require 'active_support/inflector'
module InjectEnterpriseEditionModule
- def prepend_if_ee(constant_with_prefix, namespace: Object, with_descendants: false)
- prepend_mod_for(
- constant_without_prefix(constant_with_prefix),
- namespace: namespace,
- with_descendants: with_descendants)
+ def prepend_mod_with(constant_name, namespace: Object, with_descendants: false)
+ each_extension_for(constant_name, namespace) do |constant|
+ prepend_module(constant, with_descendants)
+ end
end
- def extend_if_ee(constant_with_prefix, namespace: Object)
+ def extend_mod_with(constant_name, namespace: Object)
each_extension_for(
- constant_without_prefix(constant_with_prefix),
+ constant_name,
namespace,
&method(:extend))
end
- def include_if_ee(constant_with_prefix, namespace: Object)
+ def include_mod_with(constant_name, namespace: Object)
each_extension_for(
- constant_without_prefix(constant_with_prefix),
+ constant_name,
namespace,
&method(:include))
end
def prepend_mod(with_descendants: false)
- prepend_mod_for(name, with_descendants: with_descendants)
+ prepend_mod_with(name, with_descendants: with_descendants) # rubocop: disable Cop/InjectEnterpriseEditionModule
end
- alias_method :prepend_ee_mod, :prepend_mod
def extend_mod
- each_extension_for(name, Object, &method(:extend))
+ extend_mod_with(name) # rubocop: disable Cop/InjectEnterpriseEditionModule
end
- alias_method :extend_ee_mod, :extend_mod
def include_mod
- each_extension_for(name, Object, &method(:include))
+ include_mod_with(name) # rubocop: disable Cop/InjectEnterpriseEditionModule
end
- alias_method :include_ee_mod, :include_mod
private
- def prepend_mod_for(constant_name, namespace: Object, with_descendants: false)
- each_extension_for(constant_name, namespace) do |constant|
- prepend_module(constant, with_descendants)
- end
- end
-
def prepend_module(mod, with_descendants)
prepend(mod)
@@ -78,12 +68,6 @@ module InjectEnterpriseEditionModule
rescue NameError
false
end
-
- def constant_without_prefix(constant_with_prefix)
- constant_with_prefix
- .delete_prefix('::') # TODO: Some calling sites are passing this prefix
- .delete_prefix('EE::')
- end
end
Module.prepend(InjectEnterpriseEditionModule)
diff --git a/doc/development/creating_enums.md b/doc/development/creating_enums.md
index 1a72d99112f..301c6031d28 100644
--- a/doc/development/creating_enums.md
+++ b/doc/development/creating_enums.md
@@ -53,7 +53,7 @@ module Enums
end
end
-Enums::Pipeline.prepend_if_ee('EE::Enums::Pipeline')
+Enums::Pipeline.prepend_mod_with('Enums::Pipeline')
```
```ruby
diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md
index a5b76c32a96..452b957c705 100644
--- a/doc/development/ee_features.md
+++ b/doc/development/ee_features.md
@@ -94,11 +94,11 @@ class User < ActiveRecord::Base
# ... lots of code here ...
end
-User.prepend_ee_mod
+User.prepend_mod
```
Do not use methods such as `prepend`, `extend`, and `include`. Instead, use
-`prepend_ee_mod`, `extend_ee_mod`, or `include_ee_mod`. These methods will try to
+`prepend_mod`, `extend_mod`, or `include_mod`. These methods will try to
find the relevant EE module by the name of the receiver module, for example;
```ruby
@@ -108,13 +108,13 @@ module Vulnerabilities
end
end
-Vulnerabilities::Finding.prepend_ee_mod
+Vulnerabilities::Finding.prepend_mod
```
will prepend the module named `::EE::Vulnerabilities::Finding`.
If the extending module does not follow this naming convention, you can also provide the module name
-by using `prepend_if_ee`, `extend_if_ee`, or `include_if_ee`. These methods take a
+by using `prepend_mod_with`, `extend_mod_with`, or `include_mod_with`. These methods take a
_String_ containing the full module name as the argument, not the module itself, like so;
```ruby
@@ -122,7 +122,7 @@ class User
#...
end
-User.prepend_if_ee('::EE::UserExtension')
+User.prepend_mod_with('UserExtension')
```
Since the module would require an `EE` namespace, the file should also be
@@ -254,7 +254,7 @@ class ApplicationController < ActionController::Base
# ...
end
-ApplicationController.prepend_if_ee('EE::ApplicationController')
+ApplicationController.prepend_mod_with('ApplicationController')
```
And create a new file in the `ee/` sub-directory with the altered
@@ -429,7 +429,7 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::PruneOrphanedGeoEvents.prepend_if_ee('EE::Gitlab::BackgroundMigration::PruneOrphanedGeoEvents')
+Gitlab::BackgroundMigration::PruneOrphanedGeoEvents.prepend_mod_with('Gitlab::BackgroundMigration::PruneOrphanedGeoEvents')
```
GitLab EE:
@@ -563,7 +563,7 @@ EE-specific LDAP classes in `ee/lib/ee/gitlab/ldap`.
### Code in `lib/api/`
-It can be very tricky to extend EE features by a single line of `prepend_if_ee`,
+It can be very tricky to extend EE features by a single line of `prepend_mod_with`,
and for each different [Grape](https://github.com/ruby-grape/grape) feature, we
might need different strategies to extend it. To apply different strategies
easily, we would use `extend ActiveSupport::Concern` in the EE module.
@@ -602,7 +602,7 @@ constants.
We can define `params` and use `use` in another `params` definition to
include parameters defined in EE. However, we need to define the "interface" first
in CE in order for EE to override it. We don't have to do this in other places
-due to `prepend_if_ee`, but Grape is complex internally and we couldn't easily
+due to `prepend_mod_with`, but Grape is complex internally and we couldn't easily
do that, so we follow regular object-oriented practices that we define the
interface first here.
@@ -642,7 +642,7 @@ module API
end
end
-API::Helpers::ProjectsHelpers.prepend_if_ee('EE::API::Helpers::ProjectsHelpers')
+API::Helpers::ProjectsHelpers.prepend_mod_with('API::Helpers::ProjectsHelpers')
```
We could override it in EE module:
@@ -683,7 +683,7 @@ module API
end
end
-API::JobArtifacts.prepend_if_ee('EE::API::JobArtifacts')
+API::JobArtifacts.prepend_mod_with('API::JobArtifacts')
```
And then we can follow regular object-oriented practices to override it:
@@ -736,7 +736,7 @@ module API
end
end
-API::MergeRequests.prepend_if_ee('EE::API::MergeRequests')
+API::MergeRequests.prepend_mod_with('API::MergeRequests')
```
Note that `update_merge_request_ee` doesn't do anything in CE, but
@@ -777,7 +777,7 @@ can't easily extend it with an EE module because Grape has different context in
different blocks. In order to overcome this, we need to move the data to a class
method that resides in a separate module or class. This allows us to extend that
module or class before its data is used, without having to place a
-`prepend_if_ee` in the middle of CE code.
+`prepend_mod_with` in the middle of CE code.
For example, in one place we need to pass an extra argument to
`at_least_one_of` so that the API could consider an EE-only argument as the
@@ -798,7 +798,7 @@ module API
end
end
-API::MergeRequests::Parameters.prepend_if_ee('EE::API::MergeRequests::Parameters')
+API::MergeRequests::Parameters.prepend_mod_with('API::MergeRequests::Parameters')
# api/merge_requests.rb
module API
@@ -848,7 +848,7 @@ class Identity < ActiveRecord::Base
[:provider]
end
- prepend_if_ee('EE::Identity')
+ prepend_mod_with('Identity')
validates :extern_uid,
allow_blank: true,
@@ -900,7 +900,7 @@ class Identity < ActiveRecord::Base
end
end
-Identity::UniquenessScopes.prepend_if_ee('EE::Identity::UniquenessScopes')
+Identity::UniquenessScopes.prepend_mod_with('Identity::UniquenessScopes')
# app/models/identity.rb
class Identity < ActiveRecord::Base
diff --git a/doc/development/service_measurement.md b/doc/development/service_measurement.md
index 895ac540838..82fb9731bcb 100644
--- a/doc/development/service_measurement.md
+++ b/doc/development/service_measurement.md
@@ -52,7 +52,7 @@ class DummyService
end
end
-DummyService.prepend_if_ee('EE::DummyService')
+DummyService.prepend_mod_with('DummyService')
DummyService.prepend(Measurable)
```
diff --git a/doc/development/testing_guide/end_to_end/page_objects.md b/doc/development/testing_guide/end_to_end/page_objects.md
index d9d78a078b2..9ffa7ea4f77 100644
--- a/doc/development/testing_guide/end_to_end/page_objects.md
+++ b/doc/development/testing_guide/end_to_end/page_objects.md
@@ -260,7 +260,7 @@ These modules must:
These steps ensure the sanity selectors check detect problems properly.
For example, `qa/qa/ee/page/merge_request/show.rb` adds EE-specific methods to `qa/qa/page/merge_request/show.rb` (with
-`QA::Page::MergeRequest::Show.prepend_if_ee('Page::MergeRequest::Show', namespace: QA)`) and following is how it's implemented
+`QA::Page::MergeRequest::Show.prepend_mod_with('Page::MergeRequest::Show', namespace: QA)`) and following is how it's implemented
(only showing the relevant part and referring to the 4 steps described above with inline comments):
```ruby
diff --git a/lib/api/api.rb b/lib/api/api.rb
index fed429aea2e..1d909ea6e19 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -297,4 +297,4 @@ module API
end
end
-API::API.prepend_ee_mod
+API::API.prepend_mod
diff --git a/lib/api/boards.rb b/lib/api/boards.rb
index 79f4b02f26a..9e829dd5e05 100644
--- a/lib/api/boards.rb
+++ b/lib/api/boards.rb
@@ -5,7 +5,7 @@ module API
include BoardsResponses
include PaginationParams
- prepend_if_ee('EE::API::BoardsResponses') # rubocop: disable Cop/InjectEnterpriseEditionModule
+ prepend_mod_with('API::BoardsResponses') # rubocop: disable Cop/InjectEnterpriseEditionModule
feature_category :boards
diff --git a/lib/api/entities/application_setting.rb b/lib/api/entities/application_setting.rb
index 2468c1f9b18..f23fce40468 100644
--- a/lib/api/entities/application_setting.rb
+++ b/lib/api/entities/application_setting.rb
@@ -36,4 +36,4 @@ module API
end
end
-API::Entities::ApplicationSetting.prepend_if_ee('EE::API::Entities::ApplicationSetting')
+API::Entities::ApplicationSetting.prepend_mod_with('API::Entities::ApplicationSetting')
diff --git a/lib/api/entities/board.rb b/lib/api/entities/board.rb
index fe0182ad772..ee0bea466e0 100644
--- a/lib/api/entities/board.rb
+++ b/lib/api/entities/board.rb
@@ -16,4 +16,4 @@ module API
end
end
-API::Entities::Board.prepend_if_ee('EE::API::Entities::Board')
+API::Entities::Board.prepend_mod_with('API::Entities::Board')
diff --git a/lib/api/entities/group.rb b/lib/api/entities/group.rb
index e430eba4880..048b7a3c15a 100644
--- a/lib/api/entities/group.rb
+++ b/lib/api/entities/group.rb
@@ -38,4 +38,4 @@ module API
end
end
-API::Entities::Group.prepend_if_ee('EE::API::Entities::Group', with_descendants: true)
+API::Entities::Group.prepend_mod_with('API::Entities::Group', with_descendants: true)
diff --git a/lib/api/entities/group_detail.rb b/lib/api/entities/group_detail.rb
index 2d9d4ca7992..e63a3fc1334 100644
--- a/lib/api/entities/group_detail.rb
+++ b/lib/api/entities/group_detail.rb
@@ -39,4 +39,4 @@ module API
end
end
-API::Entities::GroupDetail.prepend_if_ee('EE::API::Entities::GroupDetail')
+API::Entities::GroupDetail.prepend_mod_with('API::Entities::GroupDetail')
diff --git a/lib/api/entities/identity.rb b/lib/api/entities/identity.rb
index 52045b6250a..7c8cda8f9c2 100644
--- a/lib/api/entities/identity.rb
+++ b/lib/api/entities/identity.rb
@@ -8,4 +8,4 @@ module API
end
end
-API::Entities::Identity.prepend_if_ee('EE::API::Entities::Identity')
+API::Entities::Identity.prepend_mod_with('API::Entities::Identity')
diff --git a/lib/api/entities/issue.rb b/lib/api/entities/issue.rb
index 82102854394..e2506cc596e 100644
--- a/lib/api/entities/issue.rb
+++ b/lib/api/entities/issue.rb
@@ -48,4 +48,4 @@ module API
end
end
-API::Entities::Issue.prepend_if_ee('EE::API::Entities::Issue')
+API::Entities::Issue.prepend_mod_with('API::Entities::Issue')
diff --git a/lib/api/entities/issue_basic.rb b/lib/api/entities/issue_basic.rb
index 754f8e2b6e4..d27cc5498bd 100644
--- a/lib/api/entities/issue_basic.rb
+++ b/lib/api/entities/issue_basic.rb
@@ -51,4 +51,4 @@ module API
end
end
-API::Entities::IssueBasic.prepend_if_ee('EE::API::Entities::IssueBasic', with_descendants: true)
+API::Entities::IssueBasic.prepend_mod_with('API::Entities::IssueBasic', with_descendants: true)
diff --git a/lib/api/entities/job_request/response.rb b/lib/api/entities/job_request/response.rb
index bf22ea1e6e2..2e8dfc5bde0 100644
--- a/lib/api/entities/job_request/response.rb
+++ b/lib/api/entities/job_request/response.rb
@@ -34,4 +34,4 @@ module API
end
end
-API::Entities::JobRequest::Response.prepend_if_ee('EE::API::Entities::JobRequest::Response')
+API::Entities::JobRequest::Response.prepend_mod_with('API::Entities::JobRequest::Response')
diff --git a/lib/api/entities/list.rb b/lib/api/entities/list.rb
index 480e722c22c..e9d31827e2f 100644
--- a/lib/api/entities/list.rb
+++ b/lib/api/entities/list.rb
@@ -10,4 +10,4 @@ module API
end
end
-API::Entities::List.prepend_if_ee('EE::API::Entities::List')
+API::Entities::List.prepend_mod_with('API::Entities::List')
diff --git a/lib/api/entities/member.rb b/lib/api/entities/member.rb
index ad62f92e5a0..87f03adba31 100644
--- a/lib/api/entities/member.rb
+++ b/lib/api/entities/member.rb
@@ -11,4 +11,4 @@ module API
end
end
-API::Entities::Member.prepend_if_ee('EE::API::Entities::Member', with_descendants: true)
+API::Entities::Member.prepend_mod_with('API::Entities::Member', with_descendants: true)
diff --git a/lib/api/entities/merge_request_basic.rb b/lib/api/entities/merge_request_basic.rb
index 88c84c494e2..cf8d03bf176 100644
--- a/lib/api/entities/merge_request_basic.rb
+++ b/lib/api/entities/merge_request_basic.rb
@@ -89,4 +89,4 @@ module API
end
end
-API::Entities::MergeRequestBasic.prepend_if_ee('EE::API::Entities::MergeRequestBasic', with_descendants: true)
+API::Entities::MergeRequestBasic.prepend_mod_with('API::Entities::MergeRequestBasic', with_descendants: true)
diff --git a/lib/api/entities/namespace.rb b/lib/api/entities/namespace.rb
index a7e06cc3e02..f11303d41a6 100644
--- a/lib/api/entities/namespace.rb
+++ b/lib/api/entities/namespace.rb
@@ -14,4 +14,4 @@ module API
end
end
-API::Entities::Namespace.prepend_if_ee('EE::API::Entities::Namespace')
+API::Entities::Namespace.prepend_mod_with('API::Entities::Namespace')
diff --git a/lib/api/entities/project.rb b/lib/api/entities/project.rb
index 690bc5d419d..442013c07dd 100644
--- a/lib/api/entities/project.rb
+++ b/lib/api/entities/project.rb
@@ -147,4 +147,4 @@ module API
end
end
-API::Entities::Project.prepend_if_ee('EE::API::Entities::Project', with_descendants: true)
+API::Entities::Project.prepend_mod_with('API::Entities::Project', with_descendants: true)
diff --git a/lib/api/entities/protected_branch.rb b/lib/api/entities/protected_branch.rb
index e5dbaffb591..ac44d06e69c 100644
--- a/lib/api/entities/protected_branch.rb
+++ b/lib/api/entities/protected_branch.rb
@@ -12,4 +12,4 @@ module API
end
end
-API::Entities::ProtectedBranch.prepend_if_ee('EE::API::Entities::ProtectedBranch')
+API::Entities::ProtectedBranch.prepend_mod_with('API::Entities::ProtectedBranch')
diff --git a/lib/api/entities/protected_ref_access.rb b/lib/api/entities/protected_ref_access.rb
index f0185705b06..443277e23cf 100644
--- a/lib/api/entities/protected_ref_access.rb
+++ b/lib/api/entities/protected_ref_access.rb
@@ -11,4 +11,4 @@ module API
end
end
-API::Entities::ProtectedRefAccess.prepend_if_ee('EE::API::Entities::ProtectedRefAccess')
+API::Entities::ProtectedRefAccess.prepend_mod_with('API::Entities::ProtectedRefAccess')
diff --git a/lib/api/entities/todo.rb b/lib/api/entities/todo.rb
index 0acbb4cb704..8d222db488a 100644
--- a/lib/api/entities/todo.rb
+++ b/lib/api/entities/todo.rb
@@ -58,4 +58,4 @@ module API
end
end
-API::Entities::Todo.prepend_if_ee('EE::API::Entities::Todo')
+API::Entities::Todo.prepend_mod_with('API::Entities::Todo')
diff --git a/lib/api/entities/user_basic.rb b/lib/api/entities/user_basic.rb
index 80f3ee7b502..b8ee4e5a6e0 100644
--- a/lib/api/entities/user_basic.rb
+++ b/lib/api/entities/user_basic.rb
@@ -19,4 +19,4 @@ module API
end
end
-API::Entities::UserBasic.prepend_if_ee('EE::API::Entities::UserBasic')
+API::Entities::UserBasic.prepend_mod_with('API::Entities::UserBasic')
diff --git a/lib/api/entities/user_details_with_admin.rb b/lib/api/entities/user_details_with_admin.rb
index e48b1da7859..3572b677646 100644
--- a/lib/api/entities/user_details_with_admin.rb
+++ b/lib/api/entities/user_details_with_admin.rb
@@ -11,4 +11,4 @@ module API
end
end
-API::Entities::UserDetailsWithAdmin.prepend_if_ee('EE::API::Entities::UserDetailsWithAdmin')
+API::Entities::UserDetailsWithAdmin.prepend_mod_with('API::Entities::UserDetailsWithAdmin')
diff --git a/lib/api/entities/user_path.rb b/lib/api/entities/user_path.rb
index 3f007659813..ed54857d041 100644
--- a/lib/api/entities/user_path.rb
+++ b/lib/api/entities/user_path.rb
@@ -13,4 +13,4 @@ module API
end
end
-API::Entities::UserPath.prepend_if_ee('EE::API::Entities::UserPath')
+API::Entities::UserPath.prepend_mod_with('API::Entities::UserPath')
diff --git a/lib/api/entities/user_public.rb b/lib/api/entities/user_public.rb
index 685adb1dd10..78f088d3c1a 100644
--- a/lib/api/entities/user_public.rb
+++ b/lib/api/entities/user_public.rb
@@ -19,4 +19,4 @@ module API
end
end
-API::Entities::UserPublic.prepend_if_ee('EE::API::Entities::UserPublic', with_descendants: true)
+API::Entities::UserPublic.prepend_mod_with('API::Entities::UserPublic', with_descendants: true)
diff --git a/lib/api/entities/user_with_admin.rb b/lib/api/entities/user_with_admin.rb
index ab7bc738ff8..e148a5c45b5 100644
--- a/lib/api/entities/user_with_admin.rb
+++ b/lib/api/entities/user_with_admin.rb
@@ -9,4 +9,4 @@ module API
end
end
-API::Entities::UserWithAdmin.prepend_if_ee('EE::API::Entities::UserWithAdmin')
+API::Entities::UserWithAdmin.prepend_mod_with('API::Entities::UserWithAdmin')
diff --git a/lib/api/features.rb b/lib/api/features.rb
index 57bd7c38ad2..2ce2f7c518f 100644
--- a/lib/api/features.rb
+++ b/lib/api/features.rb
@@ -120,4 +120,4 @@ module API
end
end
-API::Features.prepend_if_ee('EE::API::Features')
+API::Features.prepend_mod_with('API::Features')
diff --git a/lib/api/group_boards.rb b/lib/api/group_boards.rb
index 90632048354..92869f8fbba 100644
--- a/lib/api/group_boards.rb
+++ b/lib/api/group_boards.rb
@@ -5,7 +5,7 @@ module API
include BoardsResponses
include PaginationParams
- prepend_if_ee('EE::API::BoardsResponses') # rubocop: disable Cop/InjectEnterpriseEditionModule
+ prepend_mod_with('API::BoardsResponses') # rubocop: disable Cop/InjectEnterpriseEditionModule
feature_category :boards
diff --git a/lib/api/group_milestones.rb b/lib/api/group_milestones.rb
index dfffd3b1209..061d0410a9c 100644
--- a/lib/api/group_milestones.rb
+++ b/lib/api/group_milestones.rb
@@ -96,4 +96,4 @@ module API
end
end
-API::GroupMilestones.prepend_if_ee('EE::API::GroupMilestones')
+API::GroupMilestones.prepend_mod_with('API::GroupMilestones')
diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index 912813d5bb7..1a604e70bf1 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -401,4 +401,4 @@ module API
end
end
-API::Groups.prepend_if_ee('EE::API::Groups')
+API::Groups.prepend_mod_with('API::Groups')
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 12edb77d46f..632717e1b73 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -718,4 +718,4 @@ module API
end
end
-API::Helpers.prepend_if_ee('EE::API::Helpers')
+API::Helpers.prepend_mod_with('API::Helpers')
diff --git a/lib/api/helpers/award_emoji.rb b/lib/api/helpers/award_emoji.rb
index ef417331026..5b659c4dde7 100644
--- a/lib/api/helpers/award_emoji.rb
+++ b/lib/api/helpers/award_emoji.rb
@@ -37,4 +37,4 @@ module API
end
end
-API::Helpers::AwardEmoji.prepend_if_ee('EE::API::Helpers::AwardEmoji')
+API::Helpers::AwardEmoji.prepend_mod_with('API::Helpers::AwardEmoji')
diff --git a/lib/api/helpers/common_helpers.rb b/lib/api/helpers/common_helpers.rb
index 8940cf87f82..02942820982 100644
--- a/lib/api/helpers/common_helpers.rb
+++ b/lib/api/helpers/common_helpers.rb
@@ -40,4 +40,4 @@ module API
end
end
-API::Helpers::CommonHelpers.prepend_if_ee('EE::API::Helpers::CommonHelpers')
+API::Helpers::CommonHelpers.prepend_mod_with('API::Helpers::CommonHelpers')
diff --git a/lib/api/helpers/discussions_helpers.rb b/lib/api/helpers/discussions_helpers.rb
index 3c0db1d0ea9..cb2feeda1e1 100644
--- a/lib/api/helpers/discussions_helpers.rb
+++ b/lib/api/helpers/discussions_helpers.rb
@@ -17,4 +17,4 @@ module API
end
end
-API::Helpers::DiscussionsHelpers.prepend_if_ee('EE::API::Helpers::DiscussionsHelpers')
+API::Helpers::DiscussionsHelpers.prepend_mod_with('API::Helpers::DiscussionsHelpers')
diff --git a/lib/api/helpers/groups_helpers.rb b/lib/api/helpers/groups_helpers.rb
index ba07a70ee32..5c5109f3d21 100644
--- a/lib/api/helpers/groups_helpers.rb
+++ b/lib/api/helpers/groups_helpers.rb
@@ -48,4 +48,4 @@ module API
end
end
-API::Helpers::GroupsHelpers.prepend_if_ee('EE::API::Helpers::GroupsHelpers')
+API::Helpers::GroupsHelpers.prepend_mod_with('API::Helpers::GroupsHelpers')
diff --git a/lib/api/helpers/issues_helpers.rb b/lib/api/helpers/issues_helpers.rb
index 452396689f8..b1954f8ece9 100644
--- a/lib/api/helpers/issues_helpers.rb
+++ b/lib/api/helpers/issues_helpers.rb
@@ -76,4 +76,4 @@ module API
end
end
-API::Helpers::IssuesHelpers.prepend_if_ee('EE::API::Helpers::IssuesHelpers')
+API::Helpers::IssuesHelpers.prepend_mod_with('API::Helpers::IssuesHelpers')
diff --git a/lib/api/helpers/members_helpers.rb b/lib/api/helpers/members_helpers.rb
index 2de077b5a3b..08cb0944e15 100644
--- a/lib/api/helpers/members_helpers.rb
+++ b/lib/api/helpers/members_helpers.rb
@@ -65,4 +65,4 @@ module API
end
end
-API::Helpers::MembersHelpers.prepend_if_ee('EE::API::Helpers::MembersHelpers')
+API::Helpers::MembersHelpers.prepend_mod_with('API::Helpers::MembersHelpers')
diff --git a/lib/api/helpers/notes_helpers.rb b/lib/api/helpers/notes_helpers.rb
index cb938bc8a14..356e4a98c97 100644
--- a/lib/api/helpers/notes_helpers.rb
+++ b/lib/api/helpers/notes_helpers.rb
@@ -151,4 +151,4 @@ module API
end
end
-API::Helpers::NotesHelpers.prepend_if_ee('EE::API::Helpers::NotesHelpers')
+API::Helpers::NotesHelpers.prepend_mod_with('API::Helpers::NotesHelpers')
diff --git a/lib/api/helpers/project_snapshots_helpers.rb b/lib/api/helpers/project_snapshots_helpers.rb
index e708dbf0156..0b10641571a 100644
--- a/lib/api/helpers/project_snapshots_helpers.rb
+++ b/lib/api/helpers/project_snapshots_helpers.rb
@@ -3,7 +3,7 @@
module API
module Helpers
module ProjectSnapshotsHelpers
- prepend_if_ee('::EE::API::Helpers::ProjectSnapshotsHelpers') # rubocop: disable Cop/InjectEnterpriseEditionModule
+ prepend_mod_with('API::Helpers::ProjectSnapshotsHelpers') # rubocop: disable Cop/InjectEnterpriseEditionModule
def authorize_read_git_snapshot!
authenticated_with_can_read_all_resources!
diff --git a/lib/api/helpers/projects_helpers.rb b/lib/api/helpers/projects_helpers.rb
index cf2bcace33b..d9c0b4f67c8 100644
--- a/lib/api/helpers/projects_helpers.rb
+++ b/lib/api/helpers/projects_helpers.rb
@@ -170,4 +170,4 @@ module API
end
end
-API::Helpers::ProjectsHelpers.prepend_if_ee('EE::API::Helpers::ProjectsHelpers')
+API::Helpers::ProjectsHelpers.prepend_mod_with('API::Helpers::ProjectsHelpers')
diff --git a/lib/api/helpers/protected_branches_helpers.rb b/lib/api/helpers/protected_branches_helpers.rb
index 970a3687214..4a968ad1d60 100644
--- a/lib/api/helpers/protected_branches_helpers.rb
+++ b/lib/api/helpers/protected_branches_helpers.rb
@@ -12,4 +12,4 @@ module API
end
end
-API::Helpers::ProtectedBranchesHelpers.prepend_if_ee('EE::API::Helpers::ProtectedBranchesHelpers')
+API::Helpers::ProtectedBranchesHelpers.prepend_mod_with('API::Helpers::ProtectedBranchesHelpers')
diff --git a/lib/api/helpers/resource_label_events_helpers.rb b/lib/api/helpers/resource_label_events_helpers.rb
index ad2733baffc..7e641130062 100644
--- a/lib/api/helpers/resource_label_events_helpers.rb
+++ b/lib/api/helpers/resource_label_events_helpers.rb
@@ -15,4 +15,4 @@ module API
end
end
-API::Helpers::ResourceLabelEventsHelpers.prepend_if_ee('EE::API::Helpers::ResourceLabelEventsHelpers')
+API::Helpers::ResourceLabelEventsHelpers.prepend_mod_with('API::Helpers::ResourceLabelEventsHelpers')
diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb
index a74fd7de2d8..6f25cf507bc 100644
--- a/lib/api/helpers/runner.rb
+++ b/lib/api/helpers/runner.rb
@@ -5,7 +5,7 @@ module API
module Runner
include Gitlab::Utils::StrongMemoize
- prepend_if_ee('EE::API::Helpers::Runner') # rubocop: disable Cop/InjectEnterpriseEditionModule
+ prepend_mod_with('API::Helpers::Runner') # rubocop: disable Cop/InjectEnterpriseEditionModule
JOB_TOKEN_HEADER = 'HTTP_JOB_TOKEN'
JOB_TOKEN_PARAM = :token
diff --git a/lib/api/helpers/search_helpers.rb b/lib/api/helpers/search_helpers.rb
index cb5f92fa62a..66321306496 100644
--- a/lib/api/helpers/search_helpers.rb
+++ b/lib/api/helpers/search_helpers.rb
@@ -25,4 +25,4 @@ module API
end
end
-API::Helpers::SearchHelpers.prepend_if_ee('EE::API::Helpers::SearchHelpers')
+API::Helpers::SearchHelpers.prepend_mod_with('API::Helpers::SearchHelpers')
diff --git a/lib/api/helpers/services_helpers.rb b/lib/api/helpers/services_helpers.rb
index dddd7971f1b..36158557315 100644
--- a/lib/api/helpers/services_helpers.rb
+++ b/lib/api/helpers/services_helpers.rb
@@ -819,4 +819,4 @@ module API
end
end
-API::Helpers::ServicesHelpers.prepend_if_ee('EE::API::Helpers::ServicesHelpers')
+API::Helpers::ServicesHelpers.prepend_mod_with('API::Helpers::ServicesHelpers')
diff --git a/lib/api/helpers/settings_helpers.rb b/lib/api/helpers/settings_helpers.rb
index 451e578fdd6..a3ea1057bc8 100644
--- a/lib/api/helpers/settings_helpers.rb
+++ b/lib/api/helpers/settings_helpers.rb
@@ -19,4 +19,4 @@ module API
end
end
-API::Helpers::SettingsHelpers.prepend_if_ee('EE::API::Helpers::SettingsHelpers')
+API::Helpers::SettingsHelpers.prepend_mod_with('API::Helpers::SettingsHelpers')
diff --git a/lib/api/helpers/users_helpers.rb b/lib/api/helpers/users_helpers.rb
index 2d7b22e66b3..1a019283bc6 100644
--- a/lib/api/helpers/users_helpers.rb
+++ b/lib/api/helpers/users_helpers.rb
@@ -22,4 +22,4 @@ module API
end
end
-API::Helpers::UsersHelpers.prepend_if_ee('EE::API::Helpers::UsersHelpers')
+API::Helpers::UsersHelpers.prepend_mod_with('API::Helpers::UsersHelpers')
diff --git a/lib/api/helpers/variables_helpers.rb b/lib/api/helpers/variables_helpers.rb
index e2b3372fc33..edbdcb257e7 100644
--- a/lib/api/helpers/variables_helpers.rb
+++ b/lib/api/helpers/variables_helpers.rb
@@ -24,4 +24,4 @@ module API
end
end
-API::Helpers::VariablesHelpers.prepend_if_ee('EE::API::Helpers::VariablesHelpers')
+API::Helpers::VariablesHelpers.prepend_mod_with('API::Helpers::VariablesHelpers')
diff --git a/lib/api/helpers/wikis_helpers.rb b/lib/api/helpers/wikis_helpers.rb
index 49da1e317ab..4a14dc1f40a 100644
--- a/lib/api/helpers/wikis_helpers.rb
+++ b/lib/api/helpers/wikis_helpers.rb
@@ -32,4 +32,4 @@ module API
end
end
-API::Helpers::WikisHelpers.prepend_if_ee('EE::API::Helpers::WikisHelpers')
+API::Helpers::WikisHelpers.prepend_mod_with('API::Helpers::WikisHelpers')
diff --git a/lib/api/internal/base.rb b/lib/api/internal/base.rb
index ec69e1da961..e16149185c9 100644
--- a/lib/api/internal/base.rb
+++ b/lib/api/internal/base.rb
@@ -336,4 +336,4 @@ module API
end
end
-API::Internal::Base.prepend_if_ee('EE::API::Internal::Base')
+API::Internal::Base.prepend_mod_with('API::Internal::Base')
diff --git a/lib/api/internal/kubernetes.rb b/lib/api/internal/kubernetes.rb
index ca8e041b319..c28e2181873 100644
--- a/lib/api/internal/kubernetes.rb
+++ b/lib/api/internal/kubernetes.rb
@@ -126,4 +126,4 @@ module API
end
end
-API::Internal::Kubernetes.prepend_if_ee('EE::API::Internal::Kubernetes')
+API::Internal::Kubernetes.prepend_mod_with('API::Internal::Kubernetes')
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 23366505c4a..a78e1f8cc27 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -448,4 +448,4 @@ module API
end
end
-API::Issues.prepend_if_ee('EE::API::Issues')
+API::Issues.prepend_mod_with('API::Issues')
diff --git a/lib/api/job_artifacts.rb b/lib/api/job_artifacts.rb
index 3dec0a29181..37199279205 100644
--- a/lib/api/job_artifacts.rb
+++ b/lib/api/job_artifacts.rb
@@ -13,7 +13,7 @@ module API
end
end
- prepend_if_ee('EE::API::JobArtifacts') # rubocop: disable Cop/InjectEnterpriseEditionModule
+ prepend_mod_with('API::JobArtifacts') # rubocop: disable Cop/InjectEnterpriseEditionModule
params do
requires :id, type: String, desc: 'The ID of a project'
diff --git a/lib/api/jobs.rb b/lib/api/jobs.rb
index 54951f9bd01..cf65bfdfd0e 100644
--- a/lib/api/jobs.rb
+++ b/lib/api/jobs.rb
@@ -202,4 +202,4 @@ module API
end
end
-API::Jobs.prepend_if_ee('EE::API::Jobs')
+API::Jobs.prepend_mod_with('API::Jobs')
diff --git a/lib/api/members.rb b/lib/api/members.rb
index aaf0e3e1927..a1a733ea7ae 100644
--- a/lib/api/members.rb
+++ b/lib/api/members.rb
@@ -175,4 +175,4 @@ module API
end
end
-API::Members.prepend_if_ee('EE::API::Members')
+API::Members.prepend_mod_with('API::Members')
diff --git a/lib/api/merge_request_approvals.rb b/lib/api/merge_request_approvals.rb
index 0cdfd8f94b4..c61c787472d 100644
--- a/lib/api/merge_request_approvals.rb
+++ b/lib/api/merge_request_approvals.rb
@@ -79,4 +79,4 @@ module API
end
end
-API::MergeRequestApprovals.prepend_if_ee('EE::API::MergeRequestApprovals')
+API::MergeRequestApprovals.prepend_mod_with('API::MergeRequestApprovals')
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 613de514ffa..1bd62b5da3a 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -52,7 +52,7 @@ module API
]
end
- prepend_if_ee('EE::API::MergeRequests') # rubocop: disable Cop/InjectEnterpriseEditionModule
+ prepend_mod_with('API::MergeRequests') # rubocop: disable Cop/InjectEnterpriseEditionModule
helpers do
# rubocop: disable CodeReuse/ActiveRecord
diff --git a/lib/api/namespaces.rb b/lib/api/namespaces.rb
index 465d2f23e9d..9d41c2f148f 100644
--- a/lib/api/namespaces.rb
+++ b/lib/api/namespaces.rb
@@ -19,7 +19,7 @@ module API
end
end
- prepend_if_ee('EE::API::Namespaces') # rubocop: disable Cop/InjectEnterpriseEditionModule
+ prepend_mod_with('API::Namespaces') # rubocop: disable Cop/InjectEnterpriseEditionModule
resource :namespaces do
desc 'Get a namespaces list' do
diff --git a/lib/api/project_milestones.rb b/lib/api/project_milestones.rb
index 8675de33923..107311ea446 100644
--- a/lib/api/project_milestones.rb
+++ b/lib/api/project_milestones.rb
@@ -117,4 +117,4 @@ module API
end
end
-API::ProjectMilestones.prepend_if_ee('EE::API::ProjectMilestones')
+API::ProjectMilestones.prepend_mod_with('API::ProjectMilestones')
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 694e007ec47..4e8786fbe1f 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -664,4 +664,4 @@ module API
end
end
-API::Projects.prepend_if_ee('EE::API::Projects')
+API::Projects.prepend_mod_with('API::Projects')
diff --git a/lib/api/protected_branches.rb b/lib/api/protected_branches.rb
index 802dfdec511..3cebc308f51 100644
--- a/lib/api/protected_branches.rb
+++ b/lib/api/protected_branches.rb
@@ -104,4 +104,4 @@ module API
end
end
-API::ProtectedBranches.prepend_if_ee('EE::API::ProtectedBranches')
+API::ProtectedBranches.prepend_mod_with('API::ProtectedBranches')
diff --git a/lib/api/releases.rb b/lib/api/releases.rb
index b580c1fbb29..c65a23e334f 100644
--- a/lib/api/releases.rb
+++ b/lib/api/releases.rb
@@ -213,4 +213,4 @@ module API
end
end
-API::Releases.prepend_if_ee('EE::API::Releases')
+API::Releases.prepend_mod_with('API::Releases')
diff --git a/lib/api/search.rb b/lib/api/search.rb
index 8fabf379d49..3c5801366a8 100644
--- a/lib/api/search.rb
+++ b/lib/api/search.rb
@@ -138,4 +138,4 @@ module API
end
end
-API::Search.prepend_if_ee('EE::API::Search')
+API::Search.prepend_mod_with('API::Search')
diff --git a/lib/api/services.rb b/lib/api/services.rb
index cfcae13e518..6bf7d212f89 100644
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
@@ -172,4 +172,4 @@ module API
end
end
-API::Services.prepend_if_ee('EE::API::Services')
+API::Services.prepend_mod_with('API::Services')
diff --git a/lib/api/settings.rb b/lib/api/settings.rb
index c32825a556f..372bc7b3d8f 100644
--- a/lib/api/settings.rb
+++ b/lib/api/settings.rb
@@ -235,4 +235,4 @@ module API
end
end
-API::Settings.prepend_if_ee('EE::API::Settings')
+API::Settings.prepend_mod_with('API::Settings')
diff --git a/lib/api/todos.rb b/lib/api/todos.rb
index 06e6541164f..a001313a11f 100644
--- a/lib/api/todos.rb
+++ b/lib/api/todos.rb
@@ -124,4 +124,4 @@ module API
end
end
-API::Todos.prepend_if_ee('EE::API::Todos')
+API::Todos.prepend_mod_with('API::Todos')
diff --git a/lib/api/validations/validators/check_assignees_count.rb b/lib/api/validations/validators/check_assignees_count.rb
index 92ada159b46..15f48c09a4f 100644
--- a/lib/api/validations/validators/check_assignees_count.rb
+++ b/lib/api/validations/validators/check_assignees_count.rb
@@ -34,4 +34,4 @@ module API
end
end
-API::Validations::Validators::CheckAssigneesCount.prepend_if_ee('EE::API::Validations::Validators::CheckAssigneesCount')
+API::Validations::Validators::CheckAssigneesCount.prepend_mod_with('API::Validations::Validators::CheckAssigneesCount')
diff --git a/lib/backup/repositories.rb b/lib/backup/repositories.rb
index e5bb1e3069d..b1231eebfcc 100644
--- a/lib/backup/repositories.rb
+++ b/lib/backup/repositories.rb
@@ -329,4 +329,4 @@ module Backup
end
end
-Backup::Repositories.prepend_if_ee('EE::Backup::Repositories')
+Backup::Repositories.prepend_mod_with('Backup::Repositories')
diff --git a/lib/banzai/filter/references/epic_reference_filter.rb b/lib/banzai/filter/references/epic_reference_filter.rb
index 4ee446e5317..e25734c8b0f 100644
--- a/lib/banzai/filter/references/epic_reference_filter.rb
+++ b/lib/banzai/filter/references/epic_reference_filter.rb
@@ -21,4 +21,4 @@ module Banzai
end
end
-Banzai::Filter::References::EpicReferenceFilter.prepend_if_ee('EE::Banzai::Filter::References::EpicReferenceFilter')
+Banzai::Filter::References::EpicReferenceFilter.prepend_mod_with('Banzai::Filter::References::EpicReferenceFilter')
diff --git a/lib/banzai/filter/references/iteration_reference_filter.rb b/lib/banzai/filter/references/iteration_reference_filter.rb
index 4d260983d98..591e07013c3 100644
--- a/lib/banzai/filter/references/iteration_reference_filter.rb
+++ b/lib/banzai/filter/references/iteration_reference_filter.rb
@@ -12,4 +12,4 @@ module Banzai
end
end
-Banzai::Filter::References::IterationReferenceFilter.prepend_if_ee('EE::Banzai::Filter::References::IterationReferenceFilter')
+Banzai::Filter::References::IterationReferenceFilter.prepend_mod_with('Banzai::Filter::References::IterationReferenceFilter')
diff --git a/lib/banzai/filter/references/label_reference_filter.rb b/lib/banzai/filter/references/label_reference_filter.rb
index 9c7c95d97f4..bf6b3e47d3b 100644
--- a/lib/banzai/filter/references/label_reference_filter.rb
+++ b/lib/banzai/filter/references/label_reference_filter.rb
@@ -126,4 +126,4 @@ module Banzai
end
end
-Banzai::Filter::References::LabelReferenceFilter.prepend_if_ee('EE::Banzai::Filter::References::LabelReferenceFilter')
+Banzai::Filter::References::LabelReferenceFilter.prepend_mod_with('Banzai::Filter::References::LabelReferenceFilter')
diff --git a/lib/banzai/filter/references/reference_cache.rb b/lib/banzai/filter/references/reference_cache.rb
index 195357a8d3d..ab0c74e00d9 100644
--- a/lib/banzai/filter/references/reference_cache.rb
+++ b/lib/banzai/filter/references/reference_cache.rb
@@ -175,4 +175,4 @@ module Banzai
end
end
-Banzai::Filter::References::ReferenceCache.prepend_if_ee('EE::Banzai::Filter::References::ReferenceCache')
+Banzai::Filter::References::ReferenceCache.prepend_mod
diff --git a/lib/banzai/filter/references/vulnerability_reference_filter.rb b/lib/banzai/filter/references/vulnerability_reference_filter.rb
index ce484667fc0..aaf45304021 100644
--- a/lib/banzai/filter/references/vulnerability_reference_filter.rb
+++ b/lib/banzai/filter/references/vulnerability_reference_filter.rb
@@ -12,4 +12,4 @@ module Banzai
end
end
-Banzai::Filter::References::VulnerabilityReferenceFilter.prepend_if_ee('EE::Banzai::Filter::References::VulnerabilityReferenceFilter')
+Banzai::Filter::References::VulnerabilityReferenceFilter.prepend_mod_with('Banzai::Filter::References::VulnerabilityReferenceFilter')
diff --git a/lib/banzai/filter/sanitization_filter.rb b/lib/banzai/filter/sanitization_filter.rb
index 06dddc74eba..1e84e7e8af3 100644
--- a/lib/banzai/filter/sanitization_filter.rb
+++ b/lib/banzai/filter/sanitization_filter.rb
@@ -65,4 +65,4 @@ module Banzai
end
end
-Banzai::Filter::SanitizationFilter.prepend_if_ee('EE::Banzai::Filter::SanitizationFilter')
+Banzai::Filter::SanitizationFilter.prepend_mod_with('Banzai::Filter::SanitizationFilter')
diff --git a/lib/banzai/issuable_extractor.rb b/lib/banzai/issuable_extractor.rb
index 8994cdbed60..34b6ca99e32 100644
--- a/lib/banzai/issuable_extractor.rb
+++ b/lib/banzai/issuable_extractor.rb
@@ -58,4 +58,4 @@ module Banzai
end
end
-Banzai::IssuableExtractor.prepend_if_ee('EE::Banzai::IssuableExtractor')
+Banzai::IssuableExtractor.prepend_mod_with('Banzai::IssuableExtractor')
diff --git a/lib/banzai/pipeline/gfm_pipeline.rb b/lib/banzai/pipeline/gfm_pipeline.rb
index 028e3c44dc3..df8151b3296 100644
--- a/lib/banzai/pipeline/gfm_pipeline.rb
+++ b/lib/banzai/pipeline/gfm_pipeline.rb
@@ -76,4 +76,4 @@ module Banzai
end
end
-Banzai::Pipeline::GfmPipeline.prepend_if_ee('EE::Banzai::Pipeline::GfmPipeline')
+Banzai::Pipeline::GfmPipeline.prepend_mod_with('Banzai::Pipeline::GfmPipeline')
diff --git a/lib/banzai/pipeline/post_process_pipeline.rb b/lib/banzai/pipeline/post_process_pipeline.rb
index 32d7126c97d..889574cf6bf 100644
--- a/lib/banzai/pipeline/post_process_pipeline.rb
+++ b/lib/banzai/pipeline/post_process_pipeline.rb
@@ -33,4 +33,4 @@ module Banzai
end
end
-Banzai::Pipeline::PostProcessPipeline.prepend_if_ee('EE::Banzai::Pipeline::PostProcessPipeline')
+Banzai::Pipeline::PostProcessPipeline.prepend_mod_with('Banzai::Pipeline::PostProcessPipeline')
diff --git a/lib/banzai/pipeline/single_line_pipeline.rb b/lib/banzai/pipeline/single_line_pipeline.rb
index 65a5e28b704..0031ccc7011 100644
--- a/lib/banzai/pipeline/single_line_pipeline.rb
+++ b/lib/banzai/pipeline/single_line_pipeline.rb
@@ -40,4 +40,4 @@ module Banzai
end
end
-Banzai::Pipeline::SingleLinePipeline.prepend_if_ee('EE::Banzai::Pipeline::SingleLinePipeline')
+Banzai::Pipeline::SingleLinePipeline.prepend_mod_with('Banzai::Pipeline::SingleLinePipeline')
diff --git a/lib/banzai/reference_parser/epic_parser.rb b/lib/banzai/reference_parser/epic_parser.rb
index 7e72a260839..862d09934e9 100644
--- a/lib/banzai/reference_parser/epic_parser.rb
+++ b/lib/banzai/reference_parser/epic_parser.rb
@@ -13,4 +13,4 @@ module Banzai
end
end
-Banzai::ReferenceParser::EpicParser.prepend_if_ee('::EE::Banzai::ReferenceParser::EpicParser')
+Banzai::ReferenceParser::EpicParser.prepend_mod_with('Banzai::ReferenceParser::EpicParser')
diff --git a/lib/banzai/reference_parser/iteration_parser.rb b/lib/banzai/reference_parser/iteration_parser.rb
index 45253fa1977..981354aa8e1 100644
--- a/lib/banzai/reference_parser/iteration_parser.rb
+++ b/lib/banzai/reference_parser/iteration_parser.rb
@@ -19,4 +19,4 @@ module Banzai
end
end
-Banzai::ReferenceParser::IterationParser.prepend_if_ee('::EE::Banzai::ReferenceParser::IterationParser')
+Banzai::ReferenceParser::IterationParser.prepend_mod_with('Banzai::ReferenceParser::IterationParser')
diff --git a/lib/banzai/reference_parser/vulnerability_parser.rb b/lib/banzai/reference_parser/vulnerability_parser.rb
index 143f2605927..86b16605d39 100644
--- a/lib/banzai/reference_parser/vulnerability_parser.rb
+++ b/lib/banzai/reference_parser/vulnerability_parser.rb
@@ -13,4 +13,4 @@ module Banzai
end
end
-Banzai::ReferenceParser::VulnerabilityParser.prepend_if_ee('::EE::Banzai::ReferenceParser::VulnerabilityParser')
+Banzai::ReferenceParser::VulnerabilityParser.prepend_mod_with('Banzai::ReferenceParser::VulnerabilityParser')
diff --git a/lib/container_registry/client.rb b/lib/container_registry/client.rb
index 6f5acabe81f..8dea765dd11 100644
--- a/lib/container_registry/client.rb
+++ b/lib/container_registry/client.rb
@@ -250,4 +250,4 @@ module ContainerRegistry
end
end
-ContainerRegistry::Client.prepend_if_ee('EE::ContainerRegistry::Client')
+ContainerRegistry::Client.prepend_mod_with('ContainerRegistry::Client')
diff --git a/lib/declarative_enum.rb b/lib/declarative_enum.rb
index b890bbd364f..8dea9d6130b 100644
--- a/lib/declarative_enum.rb
+++ b/lib/declarative_enum.rb
@@ -40,7 +40,7 @@
module DeclarativeEnum
# This `prepended` hook will merge the enum definition
# of the prepended module into the base module to be
- # used by `prepend_if_ee` helper method.
+ # used by `prepend_mod_with` helper method.
def prepended(base)
base.definition.merge!(definition)
end
diff --git a/lib/event_filter.rb b/lib/event_filter.rb
index 0b5833b91ed..915ab355508 100644
--- a/lib/event_filter.rb
+++ b/lib/event_filter.rb
@@ -62,4 +62,4 @@ class EventFilter
end
end
-EventFilter.prepend_if_ee('EE::EventFilter')
+EventFilter.prepend_mod_with('EventFilter')
diff --git a/lib/feature.rb b/lib/feature.rb
index 709610b91be..87abd2689d0 100644
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -249,4 +249,4 @@ class Feature
end
end
-Feature::ActiveSupportCacheStoreAdapter.prepend_if_ee('EE::Feature::ActiveSupportCacheStoreAdapter')
+Feature::ActiveSupportCacheStoreAdapter.prepend_mod_with('Feature::ActiveSupportCacheStoreAdapter')
diff --git a/lib/feature/definition.rb b/lib/feature/definition.rb
index 510d404fe85..cd2f5cb07a2 100644
--- a/lib/feature/definition.rb
+++ b/lib/feature/definition.rb
@@ -185,4 +185,4 @@ class Feature
end
end
-Feature::Definition.prepend_if_ee('EE::Feature::Definition')
+Feature::Definition.prepend_mod_with('Feature::Definition')
diff --git a/lib/gitlab/access.rb b/lib/gitlab/access.rb
index 830980f0997..6afcd745d4e 100644
--- a/lib/gitlab/access.rb
+++ b/lib/gitlab/access.rb
@@ -159,4 +159,4 @@ module Gitlab
end
end
-Gitlab::Access.prepend_if_ee('EE::Gitlab::Access')
+Gitlab::Access.prepend_mod_with('Gitlab::Access')
diff --git a/lib/gitlab/alert_management/payload.rb b/lib/gitlab/alert_management/payload.rb
index a1063001330..1b67b91e839 100644
--- a/lib/gitlab/alert_management/payload.rb
+++ b/lib/gitlab/alert_management/payload.rb
@@ -49,4 +49,4 @@ module Gitlab
end
end
-Gitlab::AlertManagement::Payload.prepend_if_ee('EE::Gitlab::AlertManagement::Payload')
+Gitlab::AlertManagement::Payload.prepend_mod_with('Gitlab::AlertManagement::Payload')
diff --git a/lib/gitlab/alert_management/payload/generic.rb b/lib/gitlab/alert_management/payload/generic.rb
index e2db9b62dd5..15238b5e50f 100644
--- a/lib/gitlab/alert_management/payload/generic.rb
+++ b/lib/gitlab/alert_management/payload/generic.rb
@@ -27,4 +27,4 @@ module Gitlab
end
end
-Gitlab::AlertManagement::Payload::Generic.prepend_if_ee('EE::Gitlab::AlertManagement::Payload::Generic')
+Gitlab::AlertManagement::Payload::Generic.prepend_mod_with('Gitlab::AlertManagement::Payload::Generic')
diff --git a/lib/gitlab/analytics/cycle_analytics/base_query_builder.rb b/lib/gitlab/analytics/cycle_analytics/base_query_builder.rb
index 2c39b78c2d9..2607723ec60 100644
--- a/lib/gitlab/analytics/cycle_analytics/base_query_builder.rb
+++ b/lib/gitlab/analytics/cycle_analytics/base_query_builder.rb
@@ -81,4 +81,4 @@ module Gitlab
end
end
-Gitlab::Analytics::CycleAnalytics::BaseQueryBuilder.prepend_if_ee('EE::Gitlab::Analytics::CycleAnalytics::BaseQueryBuilder')
+Gitlab::Analytics::CycleAnalytics::BaseQueryBuilder.prepend_mod_with('Gitlab::Analytics::CycleAnalytics::BaseQueryBuilder')
diff --git a/lib/gitlab/analytics/cycle_analytics/data_collector.rb b/lib/gitlab/analytics/cycle_analytics/data_collector.rb
index 7d0ad4e19f6..56179533ffb 100644
--- a/lib/gitlab/analytics/cycle_analytics/data_collector.rb
+++ b/lib/gitlab/analytics/cycle_analytics/data_collector.rb
@@ -64,4 +64,4 @@ module Gitlab
end
end
-Gitlab::Analytics::CycleAnalytics::DataCollector.prepend_if_ee('EE::Gitlab::Analytics::CycleAnalytics::DataCollector')
+Gitlab::Analytics::CycleAnalytics::DataCollector.prepend_mod_with('Gitlab::Analytics::CycleAnalytics::DataCollector')
diff --git a/lib/gitlab/analytics/cycle_analytics/records_fetcher.rb b/lib/gitlab/analytics/cycle_analytics/records_fetcher.rb
index 0b9102f0398..9a37a41ff81 100644
--- a/lib/gitlab/analytics/cycle_analytics/records_fetcher.rb
+++ b/lib/gitlab/analytics/cycle_analytics/records_fetcher.rb
@@ -133,4 +133,4 @@ module Gitlab
end
end
-Gitlab::Analytics::CycleAnalytics::RecordsFetcher.prepend_if_ee('EE::Gitlab::Analytics::CycleAnalytics::RecordsFetcher')
+Gitlab::Analytics::CycleAnalytics::RecordsFetcher.prepend_mod_with('Gitlab::Analytics::CycleAnalytics::RecordsFetcher')
diff --git a/lib/gitlab/analytics/cycle_analytics/stage_events.rb b/lib/gitlab/analytics/cycle_analytics/stage_events.rb
index 02b1024b8b3..b7a11bc0418 100644
--- a/lib/gitlab/analytics/cycle_analytics/stage_events.rb
+++ b/lib/gitlab/analytics/cycle_analytics/stage_events.rb
@@ -85,4 +85,4 @@ module Gitlab
end
end
-Gitlab::Analytics::CycleAnalytics::StageEvents.prepend_if_ee('::EE::Gitlab::Analytics::CycleAnalytics::StageEvents')
+Gitlab::Analytics::CycleAnalytics::StageEvents.prepend_mod_with('Gitlab::Analytics::CycleAnalytics::StageEvents')
diff --git a/lib/gitlab/application_context.rb b/lib/gitlab/application_context.rb
index ceda82cb6f6..601f2175cfc 100644
--- a/lib/gitlab/application_context.rb
+++ b/lib/gitlab/application_context.rb
@@ -135,4 +135,4 @@ module Gitlab
end
end
-Gitlab::ApplicationContext.prepend_if_ee('EE::Gitlab::ApplicationContext')
+Gitlab::ApplicationContext.prepend_mod_with('Gitlab::ApplicationContext')
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 1f5cce249d8..d813e6199d5 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -29,7 +29,7 @@ module Gitlab
CI_JOB_USER = 'gitlab-ci-token'
class << self
- prepend_if_ee('EE::Gitlab::Auth') # rubocop: disable Cop/InjectEnterpriseEditionModule
+ prepend_mod_with('Gitlab::Auth') # rubocop: disable Cop/InjectEnterpriseEditionModule
def omniauth_enabled?
Gitlab.config.omniauth.enabled
diff --git a/lib/gitlab/auth/auth_finders.rb b/lib/gitlab/auth/auth_finders.rb
index 81442c35f6f..416e36c7ccb 100644
--- a/lib/gitlab/auth/auth_finders.rb
+++ b/lib/gitlab/auth/auth_finders.rb
@@ -321,4 +321,4 @@ module Gitlab
end
end
-Gitlab::Auth::AuthFinders.prepend_if_ee('::EE::Gitlab::Auth::AuthFinders')
+Gitlab::Auth::AuthFinders.prepend_mod_with('Gitlab::Auth::AuthFinders')
diff --git a/lib/gitlab/auth/ldap/access.rb b/lib/gitlab/auth/ldap/access.rb
index 66d20ee2b59..62a817d7c4d 100644
--- a/lib/gitlab/auth/ldap/access.rb
+++ b/lib/gitlab/auth/ldap/access.rb
@@ -117,4 +117,4 @@ module Gitlab
end
end
-Gitlab::Auth::Ldap::Access.prepend_if_ee('::EE::Gitlab::Auth::Ldap::Access')
+Gitlab::Auth::Ldap::Access.prepend_mod_with('Gitlab::Auth::Ldap::Access')
diff --git a/lib/gitlab/auth/ldap/adapter.rb b/lib/gitlab/auth/ldap/adapter.rb
index 7f85d3b1cd3..3853709698b 100644
--- a/lib/gitlab/auth/ldap/adapter.rb
+++ b/lib/gitlab/auth/ldap/adapter.rb
@@ -141,4 +141,4 @@ module Gitlab
end
end
-Gitlab::Auth::Ldap::Adapter.prepend_if_ee('::EE::Gitlab::Auth::Ldap::Adapter')
+Gitlab::Auth::Ldap::Adapter.prepend_mod_with('Gitlab::Auth::Ldap::Adapter')
diff --git a/lib/gitlab/auth/ldap/config.rb b/lib/gitlab/auth/ldap/config.rb
index 1a7874257f4..441f0d14b39 100644
--- a/lib/gitlab/auth/ldap/config.rb
+++ b/lib/gitlab/auth/ldap/config.rb
@@ -320,4 +320,4 @@ module Gitlab
end
end
-Gitlab::Auth::Ldap::Config.prepend_if_ee('::EE::Gitlab::Auth::Ldap::Config')
+Gitlab::Auth::Ldap::Config.prepend_mod_with('Gitlab::Auth::Ldap::Config')
diff --git a/lib/gitlab/auth/ldap/person.rb b/lib/gitlab/auth/ldap/person.rb
index 102820d6bd5..79e1937478c 100644
--- a/lib/gitlab/auth/ldap/person.rb
+++ b/lib/gitlab/auth/ldap/person.rb
@@ -121,4 +121,4 @@ module Gitlab
end
end
-Gitlab::Auth::Ldap::Person.prepend_if_ee('::EE::Gitlab::Auth::Ldap::Person')
+Gitlab::Auth::Ldap::Person.prepend_mod_with('Gitlab::Auth::Ldap::Person')
diff --git a/lib/gitlab/auth/ldap/user.rb b/lib/gitlab/auth/ldap/user.rb
index 814c17b7e44..d134350775d 100644
--- a/lib/gitlab/auth/ldap/user.rb
+++ b/lib/gitlab/auth/ldap/user.rb
@@ -49,4 +49,4 @@ module Gitlab
end
end
-Gitlab::Auth::Ldap::User.prepend_if_ee('::EE::Gitlab::Auth::Ldap::User')
+Gitlab::Auth::Ldap::User.prepend_mod_with('Gitlab::Auth::Ldap::User')
diff --git a/lib/gitlab/auth/o_auth/auth_hash.rb b/lib/gitlab/auth/o_auth/auth_hash.rb
index 519efd02ea4..2ec75669d24 100644
--- a/lib/gitlab/auth/o_auth/auth_hash.rb
+++ b/lib/gitlab/auth/o_auth/auth_hash.rb
@@ -92,4 +92,4 @@ module Gitlab
end
end
-Gitlab::Auth::OAuth::AuthHash.prepend_if_ee('::EE::Gitlab::Auth::OAuth::AuthHash')
+Gitlab::Auth::OAuth::AuthHash.prepend_mod_with('Gitlab::Auth::OAuth::AuthHash')
diff --git a/lib/gitlab/auth/o_auth/user.rb b/lib/gitlab/auth/o_auth/user.rb
index 5f29bb8f433..523452d1074 100644
--- a/lib/gitlab/auth/o_auth/user.rb
+++ b/lib/gitlab/auth/o_auth/user.rb
@@ -294,4 +294,4 @@ module Gitlab
end
end
-Gitlab::Auth::OAuth::User.prepend_if_ee('::EE::Gitlab::Auth::OAuth::User')
+Gitlab::Auth::OAuth::User.prepend_mod_with('Gitlab::Auth::OAuth::User')
diff --git a/lib/gitlab/auth/result.rb b/lib/gitlab/auth/result.rb
index 757a0e671c3..da874524826 100644
--- a/lib/gitlab/auth/result.rb
+++ b/lib/gitlab/auth/result.rb
@@ -25,4 +25,4 @@ module Gitlab
end
end
-Gitlab::Auth::Result.prepend_if_ee('::EE::Gitlab::Auth::Result')
+Gitlab::Auth::Result.prepend_mod_with('Gitlab::Auth::Result')
diff --git a/lib/gitlab/auth/saml/config.rb b/lib/gitlab/auth/saml/config.rb
index 67a53fa3205..3f13a264b0a 100644
--- a/lib/gitlab/auth/saml/config.rb
+++ b/lib/gitlab/auth/saml/config.rb
@@ -30,4 +30,4 @@ module Gitlab
end
end
-Gitlab::Auth::Saml::Config.prepend_if_ee('::EE::Gitlab::Auth::Saml::Config')
+Gitlab::Auth::Saml::Config.prepend_mod_with('Gitlab::Auth::Saml::Config')
diff --git a/lib/gitlab/auth/saml/user.rb b/lib/gitlab/auth/saml/user.rb
index 37bc3f9bed0..205d5fe0015 100644
--- a/lib/gitlab/auth/saml/user.rb
+++ b/lib/gitlab/auth/saml/user.rb
@@ -62,4 +62,4 @@ module Gitlab
end
end
-Gitlab::Auth::Saml::User.prepend_if_ee('::EE::Gitlab::Auth::Saml::User')
+Gitlab::Auth::Saml::User.prepend_mod_with('Gitlab::Auth::Saml::User')
diff --git a/lib/gitlab/background_migration/backfill_version_data_from_gitaly.rb b/lib/gitlab/background_migration/backfill_version_data_from_gitaly.rb
index 83d60d2db19..41f7f7f2f24 100644
--- a/lib/gitlab/background_migration/backfill_version_data_from_gitaly.rb
+++ b/lib/gitlab/background_migration/backfill_version_data_from_gitaly.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::BackfillVersionDataFromGitaly.prepend_if_ee('EE::Gitlab::BackgroundMigration::BackfillVersionDataFromGitaly')
+Gitlab::BackgroundMigration::BackfillVersionDataFromGitaly.prepend_mod_with('Gitlab::BackgroundMigration::BackfillVersionDataFromGitaly')
diff --git a/lib/gitlab/background_migration/fix_orphan_promoted_issues.rb b/lib/gitlab/background_migration/fix_orphan_promoted_issues.rb
index d6ec56ae19e..c50bf430d92 100644
--- a/lib/gitlab/background_migration/fix_orphan_promoted_issues.rb
+++ b/lib/gitlab/background_migration/fix_orphan_promoted_issues.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::FixOrphanPromotedIssues.prepend_if_ee('EE::Gitlab::BackgroundMigration::FixOrphanPromotedIssues')
+Gitlab::BackgroundMigration::FixOrphanPromotedIssues.prepend_mod_with('Gitlab::BackgroundMigration::FixOrphanPromotedIssues')
diff --git a/lib/gitlab/background_migration/fix_ruby_object_in_audit_events.rb b/lib/gitlab/background_migration/fix_ruby_object_in_audit_events.rb
index 46921a070c3..47a68c61fcc 100644
--- a/lib/gitlab/background_migration/fix_ruby_object_in_audit_events.rb
+++ b/lib/gitlab/background_migration/fix_ruby_object_in_audit_events.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::FixRubyObjectInAuditEvents.prepend_if_ee('EE::Gitlab::BackgroundMigration::FixRubyObjectInAuditEvents')
+Gitlab::BackgroundMigration::FixRubyObjectInAuditEvents.prepend_mod_with('Gitlab::BackgroundMigration::FixRubyObjectInAuditEvents')
diff --git a/lib/gitlab/background_migration/generate_gitlab_subscriptions.rb b/lib/gitlab/background_migration/generate_gitlab_subscriptions.rb
index 85bcf8558f2..160e6d2fe8b 100644
--- a/lib/gitlab/background_migration/generate_gitlab_subscriptions.rb
+++ b/lib/gitlab/background_migration/generate_gitlab_subscriptions.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::GenerateGitlabSubscriptions.prepend_if_ee('EE::Gitlab::BackgroundMigration::GenerateGitlabSubscriptions')
+Gitlab::BackgroundMigration::GenerateGitlabSubscriptions.prepend_mod_with('Gitlab::BackgroundMigration::GenerateGitlabSubscriptions')
diff --git a/lib/gitlab/background_migration/migrate_approver_to_approval_rules.rb b/lib/gitlab/background_migration/migrate_approver_to_approval_rules.rb
index 27b984b4531..ba66721f65c 100644
--- a/lib/gitlab/background_migration/migrate_approver_to_approval_rules.rb
+++ b/lib/gitlab/background_migration/migrate_approver_to_approval_rules.rb
@@ -12,4 +12,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::MigrateApproverToApprovalRules.prepend_if_ee('EE::Gitlab::BackgroundMigration::MigrateApproverToApprovalRules')
+Gitlab::BackgroundMigration::MigrateApproverToApprovalRules.prepend_mod_with('Gitlab::BackgroundMigration::MigrateApproverToApprovalRules')
diff --git a/lib/gitlab/background_migration/migrate_approver_to_approval_rules_check_progress.rb b/lib/gitlab/background_migration/migrate_approver_to_approval_rules_check_progress.rb
index 053b7363286..4899c50b9cf 100644
--- a/lib/gitlab/background_migration/migrate_approver_to_approval_rules_check_progress.rb
+++ b/lib/gitlab/background_migration/migrate_approver_to_approval_rules_check_progress.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::MigrateApproverToApprovalRulesCheckProgress.prepend_if_ee('EE::Gitlab::BackgroundMigration::MigrateApproverToApprovalRulesCheckProgress')
+Gitlab::BackgroundMigration::MigrateApproverToApprovalRulesCheckProgress.prepend_mod_with('Gitlab::BackgroundMigration::MigrateApproverToApprovalRulesCheckProgress')
diff --git a/lib/gitlab/background_migration/migrate_approver_to_approval_rules_in_batch.rb b/lib/gitlab/background_migration/migrate_approver_to_approval_rules_in_batch.rb
index 130f97b09d7..2855566d7e8 100644
--- a/lib/gitlab/background_migration/migrate_approver_to_approval_rules_in_batch.rb
+++ b/lib/gitlab/background_migration/migrate_approver_to_approval_rules_in_batch.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::MigrateApproverToApprovalRulesInBatch.prepend_if_ee('EE::Gitlab::BackgroundMigration::MigrateApproverToApprovalRulesInBatch')
+Gitlab::BackgroundMigration::MigrateApproverToApprovalRulesInBatch.prepend_mod_with('Gitlab::BackgroundMigration::MigrateApproverToApprovalRulesInBatch')
diff --git a/lib/gitlab/background_migration/migrate_devops_segments_to_groups.rb b/lib/gitlab/background_migration/migrate_devops_segments_to_groups.rb
index de2d9909961..d85f980d3f1 100644
--- a/lib/gitlab/background_migration/migrate_devops_segments_to_groups.rb
+++ b/lib/gitlab/background_migration/migrate_devops_segments_to_groups.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::MigrateDevopsSegmentsToGroups.prepend_if_ee('EE::Gitlab::BackgroundMigration::MigrateDevopsSegmentsToGroups')
+Gitlab::BackgroundMigration::MigrateDevopsSegmentsToGroups.prepend_mod_with('Gitlab::BackgroundMigration::MigrateDevopsSegmentsToGroups')
diff --git a/lib/gitlab/background_migration/migrate_security_scans.rb b/lib/gitlab/background_migration/migrate_security_scans.rb
index 189a150cb87..0ae984f2dbc 100644
--- a/lib/gitlab/background_migration/migrate_security_scans.rb
+++ b/lib/gitlab/background_migration/migrate_security_scans.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::MigrateSecurityScans.prepend_if_ee('EE::Gitlab::BackgroundMigration::MigrateSecurityScans')
+Gitlab::BackgroundMigration::MigrateSecurityScans.prepend_mod_with('Gitlab::BackgroundMigration::MigrateSecurityScans')
diff --git a/lib/gitlab/background_migration/move_epic_issues_after_epics.rb b/lib/gitlab/background_migration/move_epic_issues_after_epics.rb
index dc982e703d1..174994c7862 100644
--- a/lib/gitlab/background_migration/move_epic_issues_after_epics.rb
+++ b/lib/gitlab/background_migration/move_epic_issues_after_epics.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::MoveEpicIssuesAfterEpics.prepend_if_ee('EE::Gitlab::BackgroundMigration::MoveEpicIssuesAfterEpics')
+Gitlab::BackgroundMigration::MoveEpicIssuesAfterEpics.prepend_mod_with('Gitlab::BackgroundMigration::MoveEpicIssuesAfterEpics')
diff --git a/lib/gitlab/background_migration/populate_any_approval_rule_for_merge_requests.rb b/lib/gitlab/background_migration/populate_any_approval_rule_for_merge_requests.rb
index c3c0db2495c..890a43800c9 100644
--- a/lib/gitlab/background_migration/populate_any_approval_rule_for_merge_requests.rb
+++ b/lib/gitlab/background_migration/populate_any_approval_rule_for_merge_requests.rb
@@ -11,4 +11,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::PopulateAnyApprovalRuleForMergeRequests.prepend_if_ee('EE::Gitlab::BackgroundMigration::PopulateAnyApprovalRuleForMergeRequests')
+Gitlab::BackgroundMigration::PopulateAnyApprovalRuleForMergeRequests.prepend_mod_with('Gitlab::BackgroundMigration::PopulateAnyApprovalRuleForMergeRequests')
diff --git a/lib/gitlab/background_migration/populate_any_approval_rule_for_projects.rb b/lib/gitlab/background_migration/populate_any_approval_rule_for_projects.rb
index 2243c7531c0..ac7ed18ba14 100644
--- a/lib/gitlab/background_migration/populate_any_approval_rule_for_projects.rb
+++ b/lib/gitlab/background_migration/populate_any_approval_rule_for_projects.rb
@@ -11,4 +11,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::PopulateAnyApprovalRuleForProjects.prepend_if_ee('EE::Gitlab::BackgroundMigration::PopulateAnyApprovalRuleForProjects')
+Gitlab::BackgroundMigration::PopulateAnyApprovalRuleForProjects.prepend_mod_with('Gitlab::BackgroundMigration::PopulateAnyApprovalRuleForProjects')
diff --git a/lib/gitlab/background_migration/populate_namespace_statistics.rb b/lib/gitlab/background_migration/populate_namespace_statistics.rb
index e352ae71de6..e873ad412f2 100644
--- a/lib/gitlab/background_migration/populate_namespace_statistics.rb
+++ b/lib/gitlab/background_migration/populate_namespace_statistics.rb
@@ -13,4 +13,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::PopulateNamespaceStatistics.prepend_if_ee('EE::Gitlab::BackgroundMigration::PopulateNamespaceStatistics')
+Gitlab::BackgroundMigration::PopulateNamespaceStatistics.prepend_mod_with('Gitlab::BackgroundMigration::PopulateNamespaceStatistics')
diff --git a/lib/gitlab/background_migration/populate_resolved_on_default_branch_column.rb b/lib/gitlab/background_migration/populate_resolved_on_default_branch_column.rb
index eb72ef1de33..e95955c450d 100644
--- a/lib/gitlab/background_migration/populate_resolved_on_default_branch_column.rb
+++ b/lib/gitlab/background_migration/populate_resolved_on_default_branch_column.rb
@@ -9,4 +9,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::PopulateResolvedOnDefaultBranchColumn.prepend_if_ee('EE::Gitlab::BackgroundMigration::PopulateResolvedOnDefaultBranchColumn')
+Gitlab::BackgroundMigration::PopulateResolvedOnDefaultBranchColumn.prepend_mod_with('Gitlab::BackgroundMigration::PopulateResolvedOnDefaultBranchColumn')
diff --git a/lib/gitlab/background_migration/populate_uuids_for_security_findings.rb b/lib/gitlab/background_migration/populate_uuids_for_security_findings.rb
index 4aff9d1e2c1..175966b940d 100644
--- a/lib/gitlab/background_migration/populate_uuids_for_security_findings.rb
+++ b/lib/gitlab/background_migration/populate_uuids_for_security_findings.rb
@@ -15,4 +15,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::PopulateUuidsForSecurityFindings.prepend_if_ee('::EE::Gitlab::BackgroundMigration::PopulateUuidsForSecurityFindings')
+Gitlab::BackgroundMigration::PopulateUuidsForSecurityFindings.prepend_mod_with('Gitlab::BackgroundMigration::PopulateUuidsForSecurityFindings')
diff --git a/lib/gitlab/background_migration/populate_vulnerability_feedback_pipeline_id.rb b/lib/gitlab/background_migration/populate_vulnerability_feedback_pipeline_id.rb
index fc79f7125e3..8241fea66db 100644
--- a/lib/gitlab/background_migration/populate_vulnerability_feedback_pipeline_id.rb
+++ b/lib/gitlab/background_migration/populate_vulnerability_feedback_pipeline_id.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::PopulateVulnerabilityFeedbackPipelineId.prepend_if_ee('EE::Gitlab::BackgroundMigration::PopulateVulnerabilityFeedbackPipelineId')
+Gitlab::BackgroundMigration::PopulateVulnerabilityFeedbackPipelineId.prepend_mod_with('Gitlab::BackgroundMigration::PopulateVulnerabilityFeedbackPipelineId')
diff --git a/lib/gitlab/background_migration/populate_vulnerability_historical_statistics.rb b/lib/gitlab/background_migration/populate_vulnerability_historical_statistics.rb
index 2e81b1615d8..9a9f23e29ea 100644
--- a/lib/gitlab/background_migration/populate_vulnerability_historical_statistics.rb
+++ b/lib/gitlab/background_migration/populate_vulnerability_historical_statistics.rb
@@ -11,4 +11,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::PopulateVulnerabilityHistoricalStatistics.prepend_if_ee('EE::Gitlab::BackgroundMigration::PopulateVulnerabilityHistoricalStatistics')
+Gitlab::BackgroundMigration::PopulateVulnerabilityHistoricalStatistics.prepend_mod_with('Gitlab::BackgroundMigration::PopulateVulnerabilityHistoricalStatistics')
diff --git a/lib/gitlab/background_migration/prune_orphaned_geo_events.rb b/lib/gitlab/background_migration/prune_orphaned_geo_events.rb
index 8b16db8be35..0efbe72775c 100644
--- a/lib/gitlab/background_migration/prune_orphaned_geo_events.rb
+++ b/lib/gitlab/background_migration/prune_orphaned_geo_events.rb
@@ -14,4 +14,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::PruneOrphanedGeoEvents.prepend_if_ee('EE::Gitlab::BackgroundMigration::PruneOrphanedGeoEvents')
+Gitlab::BackgroundMigration::PruneOrphanedGeoEvents.prepend_mod_with('Gitlab::BackgroundMigration::PruneOrphanedGeoEvents')
diff --git a/lib/gitlab/background_migration/remove_duplicate_cs_findings.rb b/lib/gitlab/background_migration/remove_duplicate_cs_findings.rb
index cc9b0329556..17ef6dec4c0 100644
--- a/lib/gitlab/background_migration/remove_duplicate_cs_findings.rb
+++ b/lib/gitlab/background_migration/remove_duplicate_cs_findings.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::RemoveDuplicateCsFindings.prepend_if_ee('EE::Gitlab::BackgroundMigration::RemoveDuplicateCsFindings')
+Gitlab::BackgroundMigration::RemoveDuplicateCsFindings.prepend_mod_with('Gitlab::BackgroundMigration::RemoveDuplicateCsFindings')
diff --git a/lib/gitlab/background_migration/remove_duplicated_cs_findings_without_vulnerability_id.rb b/lib/gitlab/background_migration/remove_duplicated_cs_findings_without_vulnerability_id.rb
index cd305adc7cd..e5772fc7375 100644
--- a/lib/gitlab/background_migration/remove_duplicated_cs_findings_without_vulnerability_id.rb
+++ b/lib/gitlab/background_migration/remove_duplicated_cs_findings_without_vulnerability_id.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::RemoveDuplicatedCsFindingsWithoutVulnerabilityId.prepend_if_ee('EE::Gitlab::BackgroundMigration::RemoveDuplicatedCsFindingsWithoutVulnerabilityId')
+Gitlab::BackgroundMigration::RemoveDuplicatedCsFindingsWithoutVulnerabilityId.prepend_mod_with('Gitlab::BackgroundMigration::RemoveDuplicatedCsFindingsWithoutVulnerabilityId')
diff --git a/lib/gitlab/background_migration/remove_inaccessible_epic_todos.rb b/lib/gitlab/background_migration/remove_inaccessible_epic_todos.rb
index 74c48b237cc..cb6a600a525 100644
--- a/lib/gitlab/background_migration/remove_inaccessible_epic_todos.rb
+++ b/lib/gitlab/background_migration/remove_inaccessible_epic_todos.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::RemoveInaccessibleEpicTodos.prepend_if_ee('EE::Gitlab::BackgroundMigration::RemoveInaccessibleEpicTodos')
+Gitlab::BackgroundMigration::RemoveInaccessibleEpicTodos.prepend_mod_with('Gitlab::BackgroundMigration::RemoveInaccessibleEpicTodos')
diff --git a/lib/gitlab/background_migration/remove_undefined_occurrence_confidence_level.rb b/lib/gitlab/background_migration/remove_undefined_occurrence_confidence_level.rb
index 3920e8dc2de..540ffc6f548 100644
--- a/lib/gitlab/background_migration/remove_undefined_occurrence_confidence_level.rb
+++ b/lib/gitlab/background_migration/remove_undefined_occurrence_confidence_level.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::RemoveUndefinedOccurrenceConfidenceLevel.prepend_if_ee('EE::Gitlab::BackgroundMigration::RemoveUndefinedOccurrenceConfidenceLevel')
+Gitlab::BackgroundMigration::RemoveUndefinedOccurrenceConfidenceLevel.prepend_mod_with('Gitlab::BackgroundMigration::RemoveUndefinedOccurrenceConfidenceLevel')
diff --git a/lib/gitlab/background_migration/remove_undefined_occurrence_severity_level.rb b/lib/gitlab/background_migration/remove_undefined_occurrence_severity_level.rb
index f137e41c728..cecb385afa0 100644
--- a/lib/gitlab/background_migration/remove_undefined_occurrence_severity_level.rb
+++ b/lib/gitlab/background_migration/remove_undefined_occurrence_severity_level.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::RemoveUndefinedOccurrenceSeverityLevel.prepend_if_ee('EE::Gitlab::BackgroundMigration::RemoveUndefinedOccurrenceSeverityLevel')
+Gitlab::BackgroundMigration::RemoveUndefinedOccurrenceSeverityLevel.prepend_mod_with('Gitlab::BackgroundMigration::RemoveUndefinedOccurrenceSeverityLevel')
diff --git a/lib/gitlab/background_migration/remove_undefined_vulnerability_confidence_level.rb b/lib/gitlab/background_migration/remove_undefined_vulnerability_confidence_level.rb
index f6ea61f4502..4be61bfb689 100644
--- a/lib/gitlab/background_migration/remove_undefined_vulnerability_confidence_level.rb
+++ b/lib/gitlab/background_migration/remove_undefined_vulnerability_confidence_level.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::RemoveUndefinedVulnerabilityConfidenceLevel.prepend_if_ee('EE::Gitlab::BackgroundMigration::RemoveUndefinedVulnerabilityConfidenceLevel')
+Gitlab::BackgroundMigration::RemoveUndefinedVulnerabilityConfidenceLevel.prepend_mod_with('Gitlab::BackgroundMigration::RemoveUndefinedVulnerabilityConfidenceLevel')
diff --git a/lib/gitlab/background_migration/remove_undefined_vulnerability_severity_level.rb b/lib/gitlab/background_migration/remove_undefined_vulnerability_severity_level.rb
index 95540cd5f49..1ea483f929f 100644
--- a/lib/gitlab/background_migration/remove_undefined_vulnerability_severity_level.rb
+++ b/lib/gitlab/background_migration/remove_undefined_vulnerability_severity_level.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::RemoveUndefinedVulnerabilitySeverityLevel.prepend_if_ee('EE::Gitlab::BackgroundMigration::RemoveUndefinedVulnerabilitySeverityLevel')
+Gitlab::BackgroundMigration::RemoveUndefinedVulnerabilitySeverityLevel.prepend_mod_with('Gitlab::BackgroundMigration::RemoveUndefinedVulnerabilitySeverityLevel')
diff --git a/lib/gitlab/background_migration/sync_blocking_issues_count.rb b/lib/gitlab/background_migration/sync_blocking_issues_count.rb
index 6262320128c..49a632952fb 100644
--- a/lib/gitlab/background_migration/sync_blocking_issues_count.rb
+++ b/lib/gitlab/background_migration/sync_blocking_issues_count.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::SyncBlockingIssuesCount.prepend_if_ee('EE::Gitlab::BackgroundMigration::SyncBlockingIssuesCount')
+Gitlab::BackgroundMigration::SyncBlockingIssuesCount.prepend_mod_with('Gitlab::BackgroundMigration::SyncBlockingIssuesCount')
diff --git a/lib/gitlab/background_migration/update_location_fingerprint_for_container_scanning_findings.rb b/lib/gitlab/background_migration/update_location_fingerprint_for_container_scanning_findings.rb
index 651df36fcfd..054b918dade 100644
--- a/lib/gitlab/background_migration/update_location_fingerprint_for_container_scanning_findings.rb
+++ b/lib/gitlab/background_migration/update_location_fingerprint_for_container_scanning_findings.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::UpdateLocationFingerprintForContainerScanningFindings.prepend_if_ee('EE::Gitlab::BackgroundMigration::UpdateLocationFingerprintForContainerScanningFindings')
+Gitlab::BackgroundMigration::UpdateLocationFingerprintForContainerScanningFindings.prepend_mod_with('Gitlab::BackgroundMigration::UpdateLocationFingerprintForContainerScanningFindings')
diff --git a/lib/gitlab/background_migration/update_vulnerabilities_from_dismissal_feedback.rb b/lib/gitlab/background_migration/update_vulnerabilities_from_dismissal_feedback.rb
index bfe9f673b53..1cc03f061fb 100644
--- a/lib/gitlab/background_migration/update_vulnerabilities_from_dismissal_feedback.rb
+++ b/lib/gitlab/background_migration/update_vulnerabilities_from_dismissal_feedback.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::UpdateVulnerabilitiesFromDismissalFeedback.prepend_if_ee('EE::Gitlab::BackgroundMigration::UpdateVulnerabilitiesFromDismissalFeedback')
+Gitlab::BackgroundMigration::UpdateVulnerabilitiesFromDismissalFeedback.prepend_mod_with('Gitlab::BackgroundMigration::UpdateVulnerabilitiesFromDismissalFeedback')
diff --git a/lib/gitlab/background_migration/update_vulnerabilities_to_dismissed.rb b/lib/gitlab/background_migration/update_vulnerabilities_to_dismissed.rb
index a2940cba6fa..60adb6b7e3e 100644
--- a/lib/gitlab/background_migration/update_vulnerabilities_to_dismissed.rb
+++ b/lib/gitlab/background_migration/update_vulnerabilities_to_dismissed.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::UpdateVulnerabilitiesToDismissed.prepend_if_ee('EE::Gitlab::BackgroundMigration::UpdateVulnerabilitiesToDismissed')
+Gitlab::BackgroundMigration::UpdateVulnerabilitiesToDismissed.prepend_mod_with('Gitlab::BackgroundMigration::UpdateVulnerabilitiesToDismissed')
diff --git a/lib/gitlab/background_migration/update_vulnerability_confidence.rb b/lib/gitlab/background_migration/update_vulnerability_confidence.rb
index 6ffaa836f3c..40d29978dd4 100644
--- a/lib/gitlab/background_migration/update_vulnerability_confidence.rb
+++ b/lib/gitlab/background_migration/update_vulnerability_confidence.rb
@@ -10,4 +10,4 @@ module Gitlab
end
end
-Gitlab::BackgroundMigration::UpdateVulnerabilityConfidence.prepend_if_ee('EE::Gitlab::BackgroundMigration::UpdateVulnerabilityConfidence')
+Gitlab::BackgroundMigration::UpdateVulnerabilityConfidence.prepend_mod_with('Gitlab::BackgroundMigration::UpdateVulnerabilityConfidence')
diff --git a/lib/gitlab/background_migration/user_mentions/models/namespace.rb b/lib/gitlab/background_migration/user_mentions/models/namespace.rb
index a2b50c41f4a..d76d06606ee 100644
--- a/lib/gitlab/background_migration/user_mentions/models/namespace.rb
+++ b/lib/gitlab/background_migration/user_mentions/models/namespace.rb
@@ -38,4 +38,4 @@ module Gitlab
end
end
-Namespace.prepend_if_ee('::EE::Namespace')
+Namespace.prepend_mod_with('Namespace')
diff --git a/lib/gitlab/checks/base_checker.rb b/lib/gitlab/checks/base_checker.rb
index 0045d8a4113..68873610408 100644
--- a/lib/gitlab/checks/base_checker.rb
+++ b/lib/gitlab/checks/base_checker.rb
@@ -57,4 +57,4 @@ module Gitlab
end
end
-Gitlab::Checks::BaseChecker.prepend_if_ee('EE::Gitlab::Checks::BaseChecker')
+Gitlab::Checks::BaseChecker.prepend_mod_with('Gitlab::Checks::BaseChecker')
diff --git a/lib/gitlab/checks/change_access.rb b/lib/gitlab/checks/change_access.rb
index 67c777f67a7..a2c3de3e775 100644
--- a/lib/gitlab/checks/change_access.rb
+++ b/lib/gitlab/checks/change_access.rb
@@ -54,4 +54,4 @@ module Gitlab
end
end
-Gitlab::Checks::ChangeAccess.prepend_if_ee('EE::Gitlab::Checks::ChangeAccess')
+Gitlab::Checks::ChangeAccess.prepend_mod_with('Gitlab::Checks::ChangeAccess')
diff --git a/lib/gitlab/checks/diff_check.rb b/lib/gitlab/checks/diff_check.rb
index b146fea66b9..a05181ab58e 100644
--- a/lib/gitlab/checks/diff_check.rb
+++ b/lib/gitlab/checks/diff_check.rb
@@ -76,4 +76,4 @@ module Gitlab
end
end
-Gitlab::Checks::DiffCheck.prepend_if_ee('EE::Gitlab::Checks::DiffCheck')
+Gitlab::Checks::DiffCheck.prepend_mod_with('Gitlab::Checks::DiffCheck')
diff --git a/lib/gitlab/checks/matching_merge_request.rb b/lib/gitlab/checks/matching_merge_request.rb
index db7af0088d0..2635ad04770 100644
--- a/lib/gitlab/checks/matching_merge_request.rb
+++ b/lib/gitlab/checks/matching_merge_request.rb
@@ -21,4 +21,4 @@ module Gitlab
end
end
-Gitlab::Checks::MatchingMergeRequest.prepend_if_ee('EE::Gitlab::Checks::MatchingMergeRequest')
+Gitlab::Checks::MatchingMergeRequest.prepend_mod_with('Gitlab::Checks::MatchingMergeRequest')
diff --git a/lib/gitlab/ci/config.rb b/lib/gitlab/ci/config.rb
index 4a43ecd49b4..9c6428d701c 100644
--- a/lib/gitlab/ci/config.rb
+++ b/lib/gitlab/ci/config.rb
@@ -129,4 +129,4 @@ module Gitlab
end
end
-Gitlab::Ci::Config.prepend_if_ee('EE::Gitlab::Ci::ConfigEE')
+Gitlab::Ci::Config.prepend_mod_with('Gitlab::Ci::ConfigEE')
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index d76cab5d7c0..c8e8f0bc1fc 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -200,4 +200,4 @@ module Gitlab
end
end
-::Gitlab::Ci::Config::Entry::Job.prepend_if_ee('::EE::Gitlab::Ci::Config::Entry::Job')
+::Gitlab::Ci::Config::Entry::Job.prepend_mod_with('Gitlab::Ci::Config::Entry::Job')
diff --git a/lib/gitlab/ci/config/entry/need.rb b/lib/gitlab/ci/config/entry/need.rb
index b3cf0f9e0fd..29dc48c7b42 100644
--- a/lib/gitlab/ci/config/entry/need.rb
+++ b/lib/gitlab/ci/config/entry/need.rb
@@ -118,4 +118,4 @@ module Gitlab
end
end
-::Gitlab::Ci::Config::Entry::Need.prepend_if_ee('::EE::Gitlab::Ci::Config::Entry::Need')
+::Gitlab::Ci::Config::Entry::Need.prepend_mod_with('Gitlab::Ci::Config::Entry::Need')
diff --git a/lib/gitlab/ci/config/entry/needs.rb b/lib/gitlab/ci/config/entry/needs.rb
index dd01cfeedff..11b202ddde9 100644
--- a/lib/gitlab/ci/config/entry/needs.rb
+++ b/lib/gitlab/ci/config/entry/needs.rb
@@ -56,4 +56,4 @@ module Gitlab
end
end
-::Gitlab::Ci::Config::Entry::Needs.prepend_if_ee('::EE::Gitlab::Ci::Config::Entry::Needs')
+::Gitlab::Ci::Config::Entry::Needs.prepend_mod_with('Gitlab::Ci::Config::Entry::Needs')
diff --git a/lib/gitlab/ci/jwt.rb b/lib/gitlab/ci/jwt.rb
index a6ae249fa58..0b94debb24e 100644
--- a/lib/gitlab/ci/jwt.rb
+++ b/lib/gitlab/ci/jwt.rb
@@ -123,4 +123,4 @@ module Gitlab
end
end
-Gitlab::Ci::Jwt.prepend_if_ee('::EE::Gitlab::Ci::Jwt')
+Gitlab::Ci::Jwt.prepend_mod_with('Gitlab::Ci::Jwt')
diff --git a/lib/gitlab/ci/parsers.rb b/lib/gitlab/ci/parsers.rb
index 83d1c795c6b..3469537a2e2 100644
--- a/lib/gitlab/ci/parsers.rb
+++ b/lib/gitlab/ci/parsers.rb
@@ -28,4 +28,4 @@ module Gitlab
end
end
-Gitlab::Ci::Parsers.prepend_if_ee('::EE::Gitlab::Ci::Parsers')
+Gitlab::Ci::Parsers.prepend_mod_with('Gitlab::Ci::Parsers')
diff --git a/lib/gitlab/ci/pipeline/chain/config/content.rb b/lib/gitlab/ci/pipeline/chain/config/content.rb
index a7680f6e593..3c150ca26bb 100644
--- a/lib/gitlab/ci/pipeline/chain/config/content.rb
+++ b/lib/gitlab/ci/pipeline/chain/config/content.rb
@@ -52,4 +52,4 @@ module Gitlab
end
end
-Gitlab::Ci::Pipeline::Chain::Config::Content.prepend_if_ee('EE::Gitlab::Ci::Pipeline::Chain::Config::Content')
+Gitlab::Ci::Pipeline::Chain::Config::Content.prepend_mod_with('Gitlab::Ci::Pipeline::Chain::Config::Content')
diff --git a/lib/gitlab/ci/pipeline/chain/limit/activity.rb b/lib/gitlab/ci/pipeline/chain/limit/activity.rb
index 3c64278e305..ef9235477db 100644
--- a/lib/gitlab/ci/pipeline/chain/limit/activity.rb
+++ b/lib/gitlab/ci/pipeline/chain/limit/activity.rb
@@ -20,4 +20,4 @@ module Gitlab
end
end
-Gitlab::Ci::Pipeline::Chain::Limit::Activity.prepend_if_ee('EE::Gitlab::Ci::Pipeline::Chain::Limit::Activity')
+Gitlab::Ci::Pipeline::Chain::Limit::Activity.prepend_mod_with('Gitlab::Ci::Pipeline::Chain::Limit::Activity')
diff --git a/lib/gitlab/ci/pipeline/chain/limit/job_activity.rb b/lib/gitlab/ci/pipeline/chain/limit/job_activity.rb
index 2e8b437252f..3706dd0b9f6 100644
--- a/lib/gitlab/ci/pipeline/chain/limit/job_activity.rb
+++ b/lib/gitlab/ci/pipeline/chain/limit/job_activity.rb
@@ -20,4 +20,4 @@ module Gitlab
end
end
-Gitlab::Ci::Pipeline::Chain::Limit::JobActivity.prepend_if_ee('EE::Gitlab::Ci::Pipeline::Chain::Limit::JobActivity')
+Gitlab::Ci::Pipeline::Chain::Limit::JobActivity.prepend_mod_with('Gitlab::Ci::Pipeline::Chain::Limit::JobActivity')
diff --git a/lib/gitlab/ci/pipeline/chain/limit/size.rb b/lib/gitlab/ci/pipeline/chain/limit/size.rb
index 739648840e9..761bdb1c484 100644
--- a/lib/gitlab/ci/pipeline/chain/limit/size.rb
+++ b/lib/gitlab/ci/pipeline/chain/limit/size.rb
@@ -20,4 +20,4 @@ module Gitlab
end
end
-Gitlab::Ci::Pipeline::Chain::Limit::Size.prepend_if_ee('EE::Gitlab::Ci::Pipeline::Chain::Limit::Size')
+Gitlab::Ci::Pipeline::Chain::Limit::Size.prepend_mod_with('Gitlab::Ci::Pipeline::Chain::Limit::Size')
diff --git a/lib/gitlab/ci/pipeline/chain/validate/abilities.rb b/lib/gitlab/ci/pipeline/chain/validate/abilities.rb
index 55c125e03d5..1c1f7abb6f6 100644
--- a/lib/gitlab/ci/pipeline/chain/validate/abilities.rb
+++ b/lib/gitlab/ci/pipeline/chain/validate/abilities.rb
@@ -57,4 +57,4 @@ module Gitlab
end
end
-Gitlab::Ci::Pipeline::Chain::Validate::Abilities.prepend_if_ee('EE::Gitlab::Ci::Pipeline::Chain::Validate::Abilities')
+Gitlab::Ci::Pipeline::Chain::Validate::Abilities.prepend_mod_with('Gitlab::Ci::Pipeline::Chain::Validate::Abilities')
diff --git a/lib/gitlab/ci/pipeline/chain/validate/external.rb b/lib/gitlab/ci/pipeline/chain/validate/external.rb
index f92a6805b3b..539b44513f0 100644
--- a/lib/gitlab/ci/pipeline/chain/validate/external.rb
+++ b/lib/gitlab/ci/pipeline/chain/validate/external.rb
@@ -147,4 +147,4 @@ module Gitlab
end
end
-Gitlab::Ci::Pipeline::Chain::Validate::External.prepend_if_ee('EE::Gitlab::Ci::Pipeline::Chain::Validate::External')
+Gitlab::Ci::Pipeline::Chain::Validate::External.prepend_mod_with('Gitlab::Ci::Pipeline::Chain::Validate::External')
diff --git a/lib/gitlab/ci/pipeline/chain/validate/security_orchestration_policy.rb b/lib/gitlab/ci/pipeline/chain/validate/security_orchestration_policy.rb
index de59a5d51e3..e3588aa3027 100644
--- a/lib/gitlab/ci/pipeline/chain/validate/security_orchestration_policy.rb
+++ b/lib/gitlab/ci/pipeline/chain/validate/security_orchestration_policy.rb
@@ -22,4 +22,4 @@ module Gitlab
end
end
-Gitlab::Ci::Pipeline::Chain::Validate::SecurityOrchestrationPolicy.prepend_if_ee('EE::Gitlab::Ci::Pipeline::Chain::Validate::SecurityOrchestrationPolicy')
+Gitlab::Ci::Pipeline::Chain::Validate::SecurityOrchestrationPolicy.prepend_mod_with('Gitlab::Ci::Pipeline::Chain::Validate::SecurityOrchestrationPolicy')
diff --git a/lib/gitlab/ci/status/build/failed.rb b/lib/gitlab/ci/status/build/failed.rb
index 4a9b9dbc52a..0656a210e4f 100644
--- a/lib/gitlab/ci/status/build/failed.rb
+++ b/lib/gitlab/ci/status/build/failed.rb
@@ -69,4 +69,4 @@ module Gitlab
end
end
-Gitlab::Ci::Status::Build::Failed.prepend_if_ee('::EE::Gitlab::Ci::Status::Build::Failed')
+Gitlab::Ci::Status::Build::Failed.prepend_mod_with('Gitlab::Ci::Status::Build::Failed')
diff --git a/lib/gitlab/ci/templates/Security/DAST-API.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/DAST-API.gitlab-ci.yml
new file mode 100644
index 00000000000..b40c4e982f7
--- /dev/null
+++ b/lib/gitlab/ci/templates/Security/DAST-API.gitlab-ci.yml
@@ -0,0 +1,48 @@
+# To use this template, add the following to your .gitlab-ci.yml file:
+#
+# include:
+# template: DAST-API.gitlab-ci.yml
+#
+# You also need to add a `dast` stage to your `stages:` configuration. A sample configuration for DAST API:
+#
+# stages:
+# - build
+# - test
+# - deploy
+# - dast
+
+# Read more about this feature here: https://docs.gitlab.com/ee/user/application_security/dast_api/index.html
+
+# Configure the scanning tool with CI/CD variables (https://docs.gitlab.com/ee/ci/variables/README.html)
+# List of variables available to configure the DAST API scanning tool:
+# https://docs.gitlab.com/ee/user/application_security/dast_api/index.html#available-cicd-variables
+
+variables:
+ # Setting this variable affects all Security templates
+ # (SAST, Dependency Scanning, ...)
+ SECURE_ANALYZERS_PREFIX: "registry.gitlab.com/gitlab-org/security-products/analyzers"
+ #
+ DAST_API_VERSION: "1"
+ DAST_API_IMAGE: $SECURE_ANALYZERS_PREFIX/api-fuzzing:$DAST_API_VERSION
+
+dast_api:
+ stage: dast
+ image: $DAST_API_IMAGE
+ allow_failure: true
+ rules:
+ - if: $DAST_API_DISABLED
+ when: never
+ - if: $DAST_API_DISABLED_FOR_DEFAULT_BRANCH &&
+ $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
+ when: never
+ - if: $CI_COMMIT_BRANCH
+ script:
+ - /peach/analyzer-dast-api
+ artifacts:
+ when: always
+ paths:
+ - gl-assets
+ - gl-dast-api-report.json
+ - gl-*.log
+ reports:
+ dast: gl-dast-api-report.json
diff --git a/lib/gitlab/ci/templates/Security/DAST.latest.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/DAST.latest.gitlab-ci.yml
index aa2ec810a23..b6282da18a4 100644
--- a/lib/gitlab/ci/templates/Security/DAST.latest.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Security/DAST.latest.gitlab-ci.yml
@@ -22,9 +22,6 @@ variables:
# Setting this variable will affect all Security templates
# (SAST, Dependency Scanning, ...)
SECURE_ANALYZERS_PREFIX: "registry.gitlab.com/gitlab-org/security-products/analyzers"
- #
- DAST_API_VERSION: "1"
- DAST_API_IMAGE: $SECURE_ANALYZERS_PREFIX/api-fuzzing:$DAST_API_VERSION
dast:
stage: dast
@@ -41,11 +38,6 @@ dast:
reports:
dast: gl-dast-report.json
rules:
- - if: $DAST_API_BETA && ( $DAST_API_SPECIFICATION ||
- $DAST_API_OPENAPI ||
- $DAST_API_POSTMAN_COLLECTION ||
- $DAST_API_HAR )
- when: never
- if: $DAST_DISABLED
when: never
- if: $DAST_DISABLED_FOR_DEFAULT_BRANCH &&
@@ -61,42 +53,4 @@ dast:
- if: $CI_COMMIT_BRANCH &&
$DAST_WEBSITE
- if: $CI_COMMIT_BRANCH &&
- $DAST_API_BETA == null &&
$DAST_API_SPECIFICATION
-
-dast_api:
- stage: dast
- image: $DAST_API_IMAGE
- allow_failure: true
- rules:
- - if: $DAST_API_BETA == null
- when: never
- - if: $DAST_DISABLED
- when: never
- - if: $DAST_DISABLED_FOR_DEFAULT_BRANCH &&
- $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
- when: never
- - if: $CI_DEFAULT_BRANCH != $CI_COMMIT_REF_NAME &&
- $REVIEW_DISABLED &&
- $DAST_API_SPECIFICATION == null &&
- $DAST_API_OPENAPI == null &&
- $DAST_API_POSTMAN_COLLECTION == null &&
- $DAST_API_HAR == null
- when: never
- - if: $DAST_API_SPECIFICATION == null &&
- $DAST_API_OPENAPI == null &&
- $DAST_API_POSTMAN_COLLECTION == null &&
- $DAST_API_HAR == null
- when: never
- - if: $CI_COMMIT_BRANCH &&
- $GITLAB_FEATURES =~ /\bdast\b/
- script:
- - /peach/analyzer-dast-api
- artifacts:
- when: always
- paths:
- - gl-assets
- - gl-dast-api-report.json
- - gl-*.log
- reports:
- dast: gl-dast-api-report.json
diff --git a/lib/gitlab/ci/trace.rb b/lib/gitlab/ci/trace.rb
index c25c4339c35..c4757edf74e 100644
--- a/lib/gitlab/ci/trace.rb
+++ b/lib/gitlab/ci/trace.rb
@@ -317,4 +317,4 @@ module Gitlab
end
end
-::Gitlab::Ci::Trace.prepend_if_ee('EE::Gitlab::Ci::Trace')
+::Gitlab::Ci::Trace.prepend_mod_with('Gitlab::Ci::Trace')
diff --git a/lib/gitlab/cleanup/orphan_job_artifact_files.rb b/lib/gitlab/cleanup/orphan_job_artifact_files.rb
index 48a1ab23fc2..05dfdcd4486 100644
--- a/lib/gitlab/cleanup/orphan_job_artifact_files.rb
+++ b/lib/gitlab/cleanup/orphan_job_artifact_files.rb
@@ -139,4 +139,4 @@ module Gitlab
end
end
-Gitlab::Cleanup::OrphanJobArtifactFiles.prepend_if_ee('EE::Gitlab::Cleanup::OrphanJobArtifactFiles')
+Gitlab::Cleanup::OrphanJobArtifactFiles.prepend_mod_with('Gitlab::Cleanup::OrphanJobArtifactFiles')
diff --git a/lib/gitlab/cleanup/orphan_job_artifact_files_batch.rb b/lib/gitlab/cleanup/orphan_job_artifact_files_batch.rb
index 4b1d16eb974..e222f2834ee 100644
--- a/lib/gitlab/cleanup/orphan_job_artifact_files_batch.rb
+++ b/lib/gitlab/cleanup/orphan_job_artifact_files_batch.rb
@@ -79,4 +79,4 @@ module Gitlab
end
end
-Gitlab::Cleanup::OrphanJobArtifactFilesBatch.prepend_if_ee('EE::Gitlab::Cleanup::OrphanJobArtifactFilesBatch')
+Gitlab::Cleanup::OrphanJobArtifactFilesBatch.prepend_mod_with('Gitlab::Cleanup::OrphanJobArtifactFilesBatch')
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index f4fa4bd6465..1ba5f4fa4ce 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -8,7 +8,9 @@ module Gitlab
# TABLES_TO_BE_RENAMED = {
# 'old_name' => 'new_name'
# }.freeze
- TABLES_TO_BE_RENAMED = {}.freeze
+ TABLES_TO_BE_RENAMED = {
+ 'analytics_instance_statistics_measurements' => 'analytics_usage_trends_measurements'
+ }.freeze
# Minimum PostgreSQL version requirement per documentation:
# https://docs.gitlab.com/ee/install/requirements.html#postgresql-requirements
@@ -384,4 +386,4 @@ module Gitlab
end
end
-Gitlab::Database.prepend_if_ee('EE::Gitlab::Database')
+Gitlab::Database.prepend_mod_with('Gitlab::Database')
diff --git a/lib/gitlab/database/consistency.rb b/lib/gitlab/database/consistency.rb
index b7d06a26ddb..e99ea7a3232 100644
--- a/lib/gitlab/database/consistency.rb
+++ b/lib/gitlab/database/consistency.rb
@@ -28,4 +28,4 @@ module Gitlab
end
end
-::Gitlab::Database::Consistency.singleton_class.prepend_if_ee('EE::Gitlab::Database::Consistency')
+::Gitlab::Database::Consistency.singleton_class.prepend_mod_with('Gitlab::Database::Consistency')
diff --git a/lib/gitlab/email/handler/reply_processing.rb b/lib/gitlab/email/handler/reply_processing.rb
index 9e476dd4e2b..63334169c8e 100644
--- a/lib/gitlab/email/handler/reply_processing.rb
+++ b/lib/gitlab/email/handler/reply_processing.rb
@@ -100,4 +100,4 @@ module Gitlab
end
end
-Gitlab::Email::Handler::ReplyProcessing.prepend_if_ee('::EE::Gitlab::Email::Handler::ReplyProcessing')
+Gitlab::Email::Handler::ReplyProcessing.prepend_mod_with('Gitlab::Email::Handler::ReplyProcessing')
diff --git a/lib/gitlab/etag_caching/router/restful.rb b/lib/gitlab/etag_caching/router/restful.rb
index 08c20e30a48..fba4b9e433a 100644
--- a/lib/gitlab/etag_caching/router/restful.rb
+++ b/lib/gitlab/etag_caching/router/restful.rb
@@ -109,4 +109,4 @@ module Gitlab
end
end
-Gitlab::EtagCaching::Router::Restful.prepend_if_ee('EE::Gitlab::EtagCaching::Router::Restful')
+Gitlab::EtagCaching::Router::Restful.prepend_mod_with('Gitlab::EtagCaching::Router::Restful')
diff --git a/lib/gitlab/exclusive_lease.rb b/lib/gitlab/exclusive_lease.rb
index ef0236f8275..6749bd6ca60 100644
--- a/lib/gitlab/exclusive_lease.rb
+++ b/lib/gitlab/exclusive_lease.rb
@@ -113,4 +113,4 @@ module Gitlab
end
end
-Gitlab::ExclusiveLease.prepend_if_ee('EE::Gitlab::ExclusiveLease')
+Gitlab::ExclusiveLease.prepend_mod_with('Gitlab::ExclusiveLease')
diff --git a/lib/gitlab/fake_application_settings.rb b/lib/gitlab/fake_application_settings.rb
index 71d2b2396f8..211c0967f89 100644
--- a/lib/gitlab/fake_application_settings.rb
+++ b/lib/gitlab/fake_application_settings.rb
@@ -33,4 +33,4 @@ module Gitlab
end
end
-Gitlab::FakeApplicationSettings.prepend_if_ee('EE::Gitlab::FakeApplicationSettings')
+Gitlab::FakeApplicationSettings.prepend_mod_with('Gitlab::FakeApplicationSettings')
diff --git a/lib/gitlab/favicon.rb b/lib/gitlab/favicon.rb
index ce1370bab0f..721518c6fcc 100644
--- a/lib/gitlab/favicon.rb
+++ b/lib/gitlab/favicon.rb
@@ -61,4 +61,4 @@ module Gitlab
end
end
-Gitlab::Favicon.prepend_if_ee('EE::Gitlab::Favicon')
+Gitlab::Favicon.prepend_mod_with('Gitlab::Favicon')
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index 0258e890e5b..b5e7220889e 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -538,4 +538,4 @@ module Gitlab
end
end
-Gitlab::GitAccess.prepend_if_ee('EE::Gitlab::GitAccess')
+Gitlab::GitAccess.prepend_mod_with('Gitlab::GitAccess')
diff --git a/lib/gitlab/git_access_design.rb b/lib/gitlab/git_access_design.rb
index 6bea9fe53b3..bf89c01305a 100644
--- a/lib/gitlab/git_access_design.rb
+++ b/lib/gitlab/git_access_design.rb
@@ -32,4 +32,4 @@ module Gitlab
end
end
-Gitlab::GitAccessDesign.prepend_if_ee('EE::Gitlab::GitAccessDesign')
+Gitlab::GitAccessDesign.prepend_mod_with('Gitlab::GitAccessDesign')
diff --git a/lib/gitlab/git_access_snippet.rb b/lib/gitlab/git_access_snippet.rb
index 88a75f72840..9a431dc7088 100644
--- a/lib/gitlab/git_access_snippet.rb
+++ b/lib/gitlab/git_access_snippet.rb
@@ -141,4 +141,4 @@ module Gitlab
end
end
-Gitlab::GitAccessSnippet.prepend_if_ee('EE::Gitlab::GitAccessSnippet')
+Gitlab::GitAccessSnippet.prepend_mod_with('Gitlab::GitAccessSnippet')
diff --git a/lib/gitlab/git_access_wiki.rb b/lib/gitlab/git_access_wiki.rb
index 3011b794b8f..0963eb6b72a 100644
--- a/lib/gitlab/git_access_wiki.rb
+++ b/lib/gitlab/git_access_wiki.rb
@@ -48,4 +48,4 @@ module Gitlab
end
end
-Gitlab::GitAccessWiki.prepend_if_ee('EE::Gitlab::GitAccessWiki')
+Gitlab::GitAccessWiki.prepend_mod_with('Gitlab::GitAccessWiki')
diff --git a/lib/gitlab/github_import/parallel_importer.rb b/lib/gitlab/github_import/parallel_importer.rb
index 1b4750da868..2429fa4de1d 100644
--- a/lib/gitlab/github_import/parallel_importer.rb
+++ b/lib/gitlab/github_import/parallel_importer.rb
@@ -40,4 +40,4 @@ module Gitlab
end
end
-Gitlab::GithubImport::ParallelImporter.prepend_if_ee('::EE::Gitlab::GithubImport::ParallelImporter')
+Gitlab::GithubImport::ParallelImporter.prepend_mod_with('Gitlab::GithubImport::ParallelImporter')
diff --git a/lib/gitlab/gl_repository/repo_type.rb b/lib/gitlab/gl_repository/repo_type.rb
index 4b1f4fcc2a2..05278b2dd35 100644
--- a/lib/gitlab/gl_repository/repo_type.rb
+++ b/lib/gitlab/gl_repository/repo_type.rb
@@ -81,4 +81,4 @@ module Gitlab
end
end
-Gitlab::GlRepository::RepoType.prepend_if_ee('EE::Gitlab::GlRepository::RepoType')
+Gitlab::GlRepository::RepoType.prepend_mod_with('Gitlab::GlRepository::RepoType')
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index 08c17058fcb..1fd210c521e 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -80,4 +80,4 @@ module Gitlab
end
end
-Gitlab::GonHelper.prepend_if_ee('EE::Gitlab::GonHelper')
+Gitlab::GonHelper.prepend_mod_with('Gitlab::GonHelper')
diff --git a/lib/gitlab/graphql/pagination/keyset/order_info.rb b/lib/gitlab/graphql/pagination/keyset/order_info.rb
index 88f9c97002c..57e85ebe7f6 100644
--- a/lib/gitlab/graphql/pagination/keyset/order_info.rb
+++ b/lib/gitlab/graphql/pagination/keyset/order_info.rb
@@ -121,4 +121,4 @@ module Gitlab
end
end
-Gitlab::Graphql::Pagination::Keyset::OrderInfo.prepend_if_ee('EE::Gitlab::Graphql::Pagination::Keyset::OrderInfo')
+Gitlab::Graphql::Pagination::Keyset::OrderInfo.prepend_mod_with('Gitlab::Graphql::Pagination::Keyset::OrderInfo')
diff --git a/lib/gitlab/group_search_results.rb b/lib/gitlab/group_search_results.rb
index dd872caee0e..4eea96f8344 100644
--- a/lib/gitlab/group_search_results.rb
+++ b/lib/gitlab/group_search_results.rb
@@ -39,4 +39,4 @@ module Gitlab
end
end
-Gitlab::GroupSearchResults.prepend_if_ee('EE::Gitlab::GroupSearchResults')
+Gitlab::GroupSearchResults.prepend_mod_with('Gitlab::GroupSearchResults')
diff --git a/lib/gitlab/hook_data/group_member_builder.rb b/lib/gitlab/hook_data/group_member_builder.rb
index 32cfd032ffe..2998550a4b5 100644
--- a/lib/gitlab/hook_data/group_member_builder.rb
+++ b/lib/gitlab/hook_data/group_member_builder.rb
@@ -62,4 +62,4 @@ module Gitlab
end
end
-Gitlab::HookData::GroupMemberBuilder.prepend_if_ee('EE::Gitlab::HookData::GroupMemberBuilder')
+Gitlab::HookData::GroupMemberBuilder.prepend_mod_with('Gitlab::HookData::GroupMemberBuilder')
diff --git a/lib/gitlab/hook_data/issue_builder.rb b/lib/gitlab/hook_data/issue_builder.rb
index f38012c9804..d5595e80bdf 100644
--- a/lib/gitlab/hook_data/issue_builder.rb
+++ b/lib/gitlab/hook_data/issue_builder.rb
@@ -58,4 +58,4 @@ module Gitlab
end
end
-Gitlab::HookData::IssueBuilder.prepend_if_ee('EE::Gitlab::HookData::IssueBuilder')
+Gitlab::HookData::IssueBuilder.prepend_mod_with('Gitlab::HookData::IssueBuilder')
diff --git a/lib/gitlab/hook_data/user_builder.rb b/lib/gitlab/hook_data/user_builder.rb
index 537245e948f..54f03b863e5 100644
--- a/lib/gitlab/hook_data/user_builder.rb
+++ b/lib/gitlab/hook_data/user_builder.rb
@@ -50,4 +50,4 @@ module Gitlab
end
end
-Gitlab::HookData::UserBuilder.prepend_if_ee('EE::Gitlab::HookData::UserBuilder')
+Gitlab::HookData::UserBuilder.prepend_mod_with('Gitlab::HookData::UserBuilder')
diff --git a/lib/gitlab/import_export/project/relation_factory.rb b/lib/gitlab/import_export/project/relation_factory.rb
index 86f4c87d8f3..4678396f97e 100644
--- a/lib/gitlab/import_export/project/relation_factory.rb
+++ b/lib/gitlab/import_export/project/relation_factory.rb
@@ -175,4 +175,4 @@ module Gitlab
end
end
-Gitlab::ImportExport::Project::RelationFactory.prepend_if_ee('::EE::Gitlab::ImportExport::Project::RelationFactory')
+Gitlab::ImportExport::Project::RelationFactory.prepend_mod_with('Gitlab::ImportExport::Project::RelationFactory')
diff --git a/lib/gitlab/import_export/repo_restorer.rb b/lib/gitlab/import_export/repo_restorer.rb
index 1063d6e83c2..1c6629cf942 100644
--- a/lib/gitlab/import_export/repo_restorer.rb
+++ b/lib/gitlab/import_export/repo_restorer.rb
@@ -52,4 +52,4 @@ module Gitlab
end
end
-Gitlab::ImportExport::RepoRestorer.prepend_if_ee('EE::Gitlab::ImportExport::RepoRestorer')
+Gitlab::ImportExport::RepoRestorer.prepend_mod_with('Gitlab::ImportExport::RepoRestorer')
diff --git a/lib/gitlab/import_export/wiki_repo_saver.rb b/lib/gitlab/import_export/wiki_repo_saver.rb
index 4b1cf4915e4..162b474bfeb 100644
--- a/lib/gitlab/import_export/wiki_repo_saver.rb
+++ b/lib/gitlab/import_export/wiki_repo_saver.rb
@@ -20,4 +20,4 @@ module Gitlab
end
end
-Gitlab::ImportExport::WikiRepoSaver.prepend_if_ee('EE::Gitlab::ImportExport::WikiRepoSaver')
+Gitlab::ImportExport::WikiRepoSaver.prepend_mod_with('Gitlab::ImportExport::WikiRepoSaver')
diff --git a/lib/gitlab/import_sources.rb b/lib/gitlab/import_sources.rb
index 95c002edf0a..c9f5005cede 100644
--- a/lib/gitlab/import_sources.rb
+++ b/lib/gitlab/import_sources.rb
@@ -25,7 +25,7 @@ module Gitlab
].freeze
class << self
- prepend_if_ee('EE::Gitlab::ImportSources') # rubocop: disable Cop/InjectEnterpriseEditionModule
+ prepend_mod_with('Gitlab::ImportSources') # rubocop: disable Cop/InjectEnterpriseEditionModule
def options
import_table.to_h { |importer| [importer.title, importer.name] }
diff --git a/lib/gitlab/issuable_metadata.rb b/lib/gitlab/issuable_metadata.rb
index f96c937aec3..d0702fb5c7d 100644
--- a/lib/gitlab/issuable_metadata.rb
+++ b/lib/gitlab/issuable_metadata.rb
@@ -98,4 +98,4 @@ module Gitlab
end
end
-Gitlab::IssuableMetadata.prepend_if_ee('EE::Gitlab::IssuableMetadata')
+Gitlab::IssuableMetadata.prepend_mod_with('Gitlab::IssuableMetadata')
diff --git a/lib/gitlab/metrics/samplers/database_sampler.rb b/lib/gitlab/metrics/samplers/database_sampler.rb
index c0336a4d0fb..0a0ac6c5386 100644
--- a/lib/gitlab/metrics/samplers/database_sampler.rb
+++ b/lib/gitlab/metrics/samplers/database_sampler.rb
@@ -55,4 +55,4 @@ module Gitlab
end
end
-Gitlab::Metrics::Samplers::DatabaseSampler.prepend_if_ee('EE::Gitlab::Metrics::Samplers::DatabaseSampler')
+Gitlab::Metrics::Samplers::DatabaseSampler.prepend_mod_with('Gitlab::Metrics::Samplers::DatabaseSampler')
diff --git a/lib/gitlab/metrics/subscribers/active_record.rb b/lib/gitlab/metrics/subscribers/active_record.rb
index 0d1cd641ffe..3db3317e833 100644
--- a/lib/gitlab/metrics/subscribers/active_record.rb
+++ b/lib/gitlab/metrics/subscribers/active_record.rb
@@ -87,4 +87,4 @@ module Gitlab
end
end
-Gitlab::Metrics::Subscribers::ActiveRecord.prepend_if_ee('EE::Gitlab::Metrics::Subscribers::ActiveRecord')
+Gitlab::Metrics::Subscribers::ActiveRecord.prepend_mod_with('Gitlab::Metrics::Subscribers::ActiveRecord')
diff --git a/lib/gitlab/middleware/read_only/controller.rb b/lib/gitlab/middleware/read_only/controller.rb
index b11ee0afc10..f79025bccfe 100644
--- a/lib/gitlab/middleware/read_only/controller.rb
+++ b/lib/gitlab/middleware/read_only/controller.rb
@@ -145,4 +145,4 @@ module Gitlab
end
end
-Gitlab::Middleware::ReadOnly::Controller.prepend_if_ee('EE::Gitlab::Middleware::ReadOnly::Controller')
+Gitlab::Middleware::ReadOnly::Controller.prepend_mod_with('Gitlab::Middleware::ReadOnly::Controller')
diff --git a/lib/gitlab/object_hierarchy.rb b/lib/gitlab/object_hierarchy.rb
index 23548e30977..e6e7d97d296 100644
--- a/lib/gitlab/object_hierarchy.rb
+++ b/lib/gitlab/object_hierarchy.rb
@@ -298,4 +298,4 @@ module Gitlab
end
end
-Gitlab::ObjectHierarchy.prepend_if_ee('EE::Gitlab::ObjectHierarchy')
+Gitlab::ObjectHierarchy.prepend_mod_with('Gitlab::ObjectHierarchy')
diff --git a/lib/gitlab/omniauth_initializer.rb b/lib/gitlab/omniauth_initializer.rb
index 541f9b06842..3e14e1789bb 100644
--- a/lib/gitlab/omniauth_initializer.rb
+++ b/lib/gitlab/omniauth_initializer.rb
@@ -123,4 +123,4 @@ module Gitlab
end
end
-Gitlab::OmniauthInitializer.prepend_if_ee('::EE::Gitlab::OmniauthInitializer')
+Gitlab::OmniauthInitializer.prepend_mod_with('Gitlab::OmniauthInitializer')
diff --git a/lib/gitlab/patch/draw_route.rb b/lib/gitlab/patch/draw_route.rb
index 35a61182a9a..61b25065e8f 100644
--- a/lib/gitlab/patch/draw_route.rb
+++ b/lib/gitlab/patch/draw_route.rb
@@ -37,4 +37,4 @@ module Gitlab
end
end
-Gitlab::Patch::DrawRoute.prepend_if_ee('EE::Gitlab::Patch::DrawRoute')
+Gitlab::Patch::DrawRoute.prepend_mod_with('Gitlab::Patch::DrawRoute')
diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb
index 2ff23980ebd..8618d2da77c 100644
--- a/lib/gitlab/path_regex.rb
+++ b/lib/gitlab/path_regex.rb
@@ -288,4 +288,4 @@ module Gitlab
end
end
-Gitlab::PathRegex.prepend_if_ee('EE::Gitlab::PathRegex')
+Gitlab::PathRegex.prepend_mod_with('Gitlab::PathRegex')
diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb
index 32d3eeb8cd2..8875e6320c7 100644
--- a/lib/gitlab/project_template.rb
+++ b/lib/gitlab/project_template.rb
@@ -87,4 +87,4 @@ module Gitlab
end
end
-Gitlab::ProjectTemplate.prepend_if_ee('EE::Gitlab::ProjectTemplate')
+Gitlab::ProjectTemplate.prepend_mod_with('Gitlab::ProjectTemplate')
diff --git a/lib/gitlab/prometheus/metric_group.rb b/lib/gitlab/prometheus/metric_group.rb
index 4a39260a340..020d4cf74a3 100644
--- a/lib/gitlab/prometheus/metric_group.rb
+++ b/lib/gitlab/prometheus/metric_group.rb
@@ -31,4 +31,4 @@ module Gitlab
end
end
-Gitlab::Prometheus::MetricGroup.prepend_if_ee('EE::Gitlab::Prometheus::MetricGroup')
+Gitlab::Prometheus::MetricGroup.prepend_mod_with('Gitlab::Prometheus::MetricGroup')
diff --git a/lib/gitlab/prometheus/queries/query_additional_metrics.rb b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
index d24b98e790b..a870bb6bc5f 100644
--- a/lib/gitlab/prometheus/queries/query_additional_metrics.rb
+++ b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
@@ -98,4 +98,4 @@ module Gitlab
end
end
-Gitlab::Prometheus::Queries::QueryAdditionalMetrics.prepend_if_ee('EE::Gitlab::Prometheus::Queries::QueryAdditionalMetrics')
+Gitlab::Prometheus::Queries::QueryAdditionalMetrics.prepend_mod_with('Gitlab::Prometheus::Queries::QueryAdditionalMetrics')
diff --git a/lib/gitlab/rack_attack.rb b/lib/gitlab/rack_attack.rb
index b9367ed94d4..175f32bd4c6 100644
--- a/lib/gitlab/rack_attack.rb
+++ b/lib/gitlab/rack_attack.rb
@@ -171,4 +171,4 @@ module Gitlab
end
end
end
-::Gitlab::RackAttack.prepend_if_ee('::EE::Gitlab::RackAttack')
+::Gitlab::RackAttack.prepend_mod_with('Gitlab::RackAttack')
diff --git a/lib/gitlab/rack_attack/request.rb b/lib/gitlab/rack_attack/request.rb
index ff6c1787f89..7fee6a1b43d 100644
--- a/lib/gitlab/rack_attack/request.rb
+++ b/lib/gitlab/rack_attack/request.rb
@@ -133,4 +133,4 @@ module Gitlab
end
end
end
-::Gitlab::RackAttack::Request.prepend_if_ee('::EE::Gitlab::RackAttack::Request')
+::Gitlab::RackAttack::Request.prepend_mod_with('Gitlab::RackAttack::Request')
diff --git a/lib/gitlab/repo_path.rb b/lib/gitlab/repo_path.rb
index 46c84107e0f..42b94d5cf3b 100644
--- a/lib/gitlab/repo_path.rb
+++ b/lib/gitlab/repo_path.rb
@@ -110,4 +110,4 @@ module Gitlab
end
end
-Gitlab::RepoPath.singleton_class.prepend_if_ee('EE::Gitlab::RepoPath::ClassMethods')
+Gitlab::RepoPath.singleton_class.prepend_mod_with('Gitlab::RepoPath::ClassMethods')
diff --git a/lib/gitlab/repository_size_checker.rb b/lib/gitlab/repository_size_checker.rb
index 0ed31176dd8..2afc5e8d668 100644
--- a/lib/gitlab/repository_size_checker.rb
+++ b/lib/gitlab/repository_size_checker.rb
@@ -56,4 +56,4 @@ module Gitlab
end
end
-Gitlab::RepositorySizeChecker.prepend_if_ee('EE::Gitlab::RepositorySizeChecker')
+Gitlab::RepositorySizeChecker.prepend_mod_with('Gitlab::RepositorySizeChecker')
diff --git a/lib/gitlab/search/parsed_query.rb b/lib/gitlab/search/parsed_query.rb
index 0aaab2e0668..a397ce935cb 100644
--- a/lib/gitlab/search/parsed_query.rb
+++ b/lib/gitlab/search/parsed_query.rb
@@ -57,4 +57,4 @@ module Gitlab
end
end
-Gitlab::Search::ParsedQuery.prepend_if_ee('EE::Gitlab::Search::ParsedQuery')
+Gitlab::Search::ParsedQuery.prepend_mod_with('Gitlab::Search::ParsedQuery')
diff --git a/lib/gitlab/search_context.rb b/lib/gitlab/search_context.rb
index 0323220690a..04ef2be87f8 100644
--- a/lib/gitlab/search_context.rb
+++ b/lib/gitlab/search_context.rb
@@ -164,4 +164,4 @@ module Gitlab
end
end
-Gitlab::SearchContext::Builder.prepend_ee_mod
+Gitlab::SearchContext::Builder.prepend_mod
diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb
index d0beb74c289..678c0b396ef 100644
--- a/lib/gitlab/search_results.rb
+++ b/lib/gitlab/search_results.rb
@@ -236,4 +236,4 @@ module Gitlab
end
end
-Gitlab::SearchResults.prepend_if_ee('EE::Gitlab::SearchResults')
+Gitlab::SearchResults.prepend_mod_with('Gitlab::SearchResults')
diff --git a/lib/gitlab/sidekiq_middleware.rb b/lib/gitlab/sidekiq_middleware.rb
index 563a105484d..c5b980769f0 100644
--- a/lib/gitlab/sidekiq_middleware.rb
+++ b/lib/gitlab/sidekiq_middleware.rb
@@ -44,4 +44,4 @@ module Gitlab
end
end
-Gitlab::SidekiqMiddleware.singleton_class.prepend_if_ee('EE::Gitlab::SidekiqMiddleware')
+Gitlab::SidekiqMiddleware.singleton_class.prepend_mod_with('Gitlab::SidekiqMiddleware')
diff --git a/lib/gitlab/sidekiq_middleware/server_metrics.rb b/lib/gitlab/sidekiq_middleware/server_metrics.rb
index f5fee8050ac..474afffcf93 100644
--- a/lib/gitlab/sidekiq_middleware/server_metrics.rb
+++ b/lib/gitlab/sidekiq_middleware/server_metrics.rb
@@ -119,4 +119,4 @@ module Gitlab
end
end
-Gitlab::SidekiqMiddleware::ServerMetrics.prepend_if_ee('EE::Gitlab::SidekiqMiddleware::ServerMetrics')
+Gitlab::SidekiqMiddleware::ServerMetrics.prepend_mod_with('Gitlab::SidekiqMiddleware::ServerMetrics')
diff --git a/lib/gitlab/slash_commands/presenters/issue_base.rb b/lib/gitlab/slash_commands/presenters/issue_base.rb
index 017fb8a62c4..f6f6e3d7fc6 100644
--- a/lib/gitlab/slash_commands/presenters/issue_base.rb
+++ b/lib/gitlab/slash_commands/presenters/issue_base.rb
@@ -50,4 +50,4 @@ module Gitlab
end
end
-Gitlab::SlashCommands::Presenters::IssueBase.prepend_if_ee('EE::Gitlab::SlashCommands::Presenters::IssueBase')
+Gitlab::SlashCommands::Presenters::IssueBase.prepend_mod_with('Gitlab::SlashCommands::Presenters::IssueBase')
diff --git a/lib/gitlab/snippet_search_results.rb b/lib/gitlab/snippet_search_results.rb
index 41ec19f0da8..581d6b738f3 100644
--- a/lib/gitlab/snippet_search_results.rb
+++ b/lib/gitlab/snippet_search_results.rb
@@ -45,4 +45,4 @@ module Gitlab
end
end
-Gitlab::SnippetSearchResults.prepend_if_ee('::EE::Gitlab::SnippetSearchResults')
+Gitlab::SnippetSearchResults.prepend_mod_with('Gitlab::SnippetSearchResults')
diff --git a/lib/gitlab/template/gitlab_ci_yml_template.rb b/lib/gitlab/template/gitlab_ci_yml_template.rb
index 01158cafc4f..e1ca4b5ff6a 100644
--- a/lib/gitlab/template/gitlab_ci_yml_template.rb
+++ b/lib/gitlab/template/gitlab_ci_yml_template.rb
@@ -59,4 +59,4 @@ module Gitlab
end
end
-Gitlab::Template::GitlabCiYmlTemplate.prepend_if_ee('::EE::Gitlab::Template::GitlabCiYmlTemplate')
+Gitlab::Template::GitlabCiYmlTemplate.prepend_mod_with('Gitlab::Template::GitlabCiYmlTemplate')
diff --git a/lib/gitlab/tree_summary.rb b/lib/gitlab/tree_summary.rb
index 86cd91f0a32..85f0ba1fd25 100644
--- a/lib/gitlab/tree_summary.rb
+++ b/lib/gitlab/tree_summary.rb
@@ -161,4 +161,4 @@ module Gitlab
end
end
-Gitlab::TreeSummary.prepend_if_ee('::EE::Gitlab::TreeSummary')
+Gitlab::TreeSummary.prepend_mod_with('Gitlab::TreeSummary')
diff --git a/lib/gitlab/uploads/migration_helper.rb b/lib/gitlab/uploads/migration_helper.rb
index b610d2a10c6..deab2cd43a6 100644
--- a/lib/gitlab/uploads/migration_helper.rb
+++ b/lib/gitlab/uploads/migration_helper.rb
@@ -76,4 +76,4 @@ module Gitlab
end
end
-Gitlab::Uploads::MigrationHelper.prepend_if_ee('EE::Gitlab::Uploads::MigrationHelper')
+Gitlab::Uploads::MigrationHelper.prepend_mod_with('Gitlab::Uploads::MigrationHelper')
diff --git a/lib/gitlab/url_builder.rb b/lib/gitlab/url_builder.rb
index e2cfa1ece31..a242f718b16 100644
--- a/lib/gitlab/url_builder.rb
+++ b/lib/gitlab/url_builder.rb
@@ -127,4 +127,4 @@ module Gitlab
end
end
-::Gitlab::UrlBuilder.prepend_if_ee('EE::Gitlab::UrlBuilder')
+::Gitlab::UrlBuilder.prepend_mod_with('Gitlab::UrlBuilder')
diff --git a/lib/gitlab/usage/metric_definition.rb b/lib/gitlab/usage/metric_definition.rb
index c0cf4a4db4b..ccd2c69e2e7 100644
--- a/lib/gitlab/usage/metric_definition.rb
+++ b/lib/gitlab/usage/metric_definition.rb
@@ -121,4 +121,4 @@ module Gitlab
end
end
-Gitlab::Usage::MetricDefinition.prepend_if_ee('EE::Gitlab::Usage::MetricDefinition')
+Gitlab::Usage::MetricDefinition.prepend_mod_with('Gitlab::Usage::MetricDefinition')
diff --git a/lib/gitlab/usage/metrics/aggregates/aggregate.rb b/lib/gitlab/usage/metrics/aggregates/aggregate.rb
index ec114042037..4c40bfbc06f 100644
--- a/lib/gitlab/usage/metrics/aggregates/aggregate.rb
+++ b/lib/gitlab/usage/metrics/aggregates/aggregate.rb
@@ -109,4 +109,4 @@ module Gitlab
end
end
-Gitlab::Usage::Metrics::Aggregates::Aggregate.prepend_if_ee('EE::Gitlab::Usage::Metrics::Aggregates::Aggregate')
+Gitlab::Usage::Metrics::Aggregates::Aggregate.prepend_mod_with('Gitlab::Usage::Metrics::Aggregates::Aggregate')
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index 7a5b29d6de1..510492d8745 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -975,4 +975,4 @@ module Gitlab
end
end
-Gitlab::UsageData.prepend_if_ee('EE::Gitlab::UsageData')
+Gitlab::UsageData.prepend_mod_with('Gitlab::UsageData')
diff --git a/lib/gitlab/usage_data_counters/hll_redis_counter.rb b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
index bbbaae5a689..833eebd5d04 100644
--- a/lib/gitlab/usage_data_counters/hll_redis_counter.rb
+++ b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
@@ -277,4 +277,4 @@ module Gitlab
end
end
-Gitlab::UsageDataCounters::HLLRedisCounter.prepend_if_ee('EE::Gitlab::UsageDataCounters::HLLRedisCounter')
+Gitlab::UsageDataCounters::HLLRedisCounter.prepend_mod_with('Gitlab::UsageDataCounters::HLLRedisCounter')
diff --git a/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb b/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb
index 6f5f878501f..083de402175 100644
--- a/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb
@@ -154,4 +154,4 @@ module Gitlab
end
end
-Gitlab::UsageDataCounters::IssueActivityUniqueCounter.prepend_if_ee('EE::Gitlab::UsageDataCounters::IssueActivityUniqueCounter')
+Gitlab::UsageDataCounters::IssueActivityUniqueCounter.prepend_mod_with('Gitlab::UsageDataCounters::IssueActivityUniqueCounter')
diff --git a/lib/gitlab/web_ide/config/entry/global.rb b/lib/gitlab/web_ide/config/entry/global.rb
index 2c67c7d02d4..2939095fd0f 100644
--- a/lib/gitlab/web_ide/config/entry/global.rb
+++ b/lib/gitlab/web_ide/config/entry/global.rb
@@ -30,4 +30,4 @@ module Gitlab
end
end
-::Gitlab::WebIde::Config::Entry::Global.prepend_if_ee('EE::Gitlab::WebIde::Config::Entry::Global')
+::Gitlab::WebIde::Config::Entry::Global.prepend_mod_with('Gitlab::WebIde::Config::Entry::Global')
diff --git a/lib/peek/views/active_record.rb b/lib/peek/views/active_record.rb
index 4040bed50a9..774e4768597 100644
--- a/lib/peek/views/active_record.rb
+++ b/lib/peek/views/active_record.rb
@@ -67,4 +67,4 @@ module Peek
end
end
-Peek::Views::ActiveRecord.prepend_if_ee('EE::Peek::Views::ActiveRecord')
+Peek::Views::ActiveRecord.prepend_mod_with('Peek::Views::ActiveRecord')
diff --git a/lib/sidebars/projects/menus/analytics_menu.rb b/lib/sidebars/projects/menus/analytics_menu.rb
index c9e9200f174..660965005c3 100644
--- a/lib/sidebars/projects/menus/analytics_menu.rb
+++ b/lib/sidebars/projects/menus/analytics_menu.rb
@@ -92,4 +92,4 @@ module Sidebars
end
end
-Sidebars::Projects::Menus::AnalyticsMenu.prepend_if_ee('EE::Sidebars::Projects::Menus::AnalyticsMenu')
+Sidebars::Projects::Menus::AnalyticsMenu.prepend_mod_with('Sidebars::Projects::Menus::AnalyticsMenu')
diff --git a/lib/sidebars/projects/menus/ci_cd_menu.rb b/lib/sidebars/projects/menus/ci_cd_menu.rb
index 29bfaa4f7e0..042ad17fdfc 100644
--- a/lib/sidebars/projects/menus/ci_cd_menu.rb
+++ b/lib/sidebars/projects/menus/ci_cd_menu.rb
@@ -115,4 +115,4 @@ module Sidebars
end
end
-Sidebars::Projects::Menus::CiCdMenu.prepend_if_ee('EE::Sidebars::Projects::Menus::CiCdMenu')
+Sidebars::Projects::Menus::CiCdMenu.prepend_mod_with('Sidebars::Projects::Menus::CiCdMenu')
diff --git a/lib/sidebars/projects/menus/issues_menu.rb b/lib/sidebars/projects/menus/issues_menu.rb
index 032e89f2815..4e8f9ec2b69 100644
--- a/lib/sidebars/projects/menus/issues_menu.rb
+++ b/lib/sidebars/projects/menus/issues_menu.rb
@@ -128,4 +128,4 @@ module Sidebars
end
end
-Sidebars::Projects::Menus::IssuesMenu.prepend_if_ee('EE::Sidebars::Projects::Menus::IssuesMenu')
+Sidebars::Projects::Menus::IssuesMenu.prepend_mod_with('Sidebars::Projects::Menus::IssuesMenu')
diff --git a/lib/sidebars/projects/menus/operations_menu.rb b/lib/sidebars/projects/menus/operations_menu.rb
index ff112906dca..3503dcaa0c1 100644
--- a/lib/sidebars/projects/menus/operations_menu.rb
+++ b/lib/sidebars/projects/menus/operations_menu.rb
@@ -241,4 +241,4 @@ module Sidebars
end
end
-Sidebars::Projects::Menus::OperationsMenu.prepend_if_ee('EE::Sidebars::Projects::Menus::OperationsMenu')
+Sidebars::Projects::Menus::OperationsMenu.prepend_mod_with('Sidebars::Projects::Menus::OperationsMenu')
diff --git a/lib/sidebars/projects/menus/repository_menu.rb b/lib/sidebars/projects/menus/repository_menu.rb
index 5d00f78ffd4..a784aecc3dc 100644
--- a/lib/sidebars/projects/menus/repository_menu.rb
+++ b/lib/sidebars/projects/menus/repository_menu.rb
@@ -120,4 +120,4 @@ module Sidebars
end
end
-Sidebars::Projects::Menus::RepositoryMenu.prepend_if_ee('EE::Sidebars::Projects::Menus::RepositoryMenu')
+Sidebars::Projects::Menus::RepositoryMenu.prepend_mod_with('Sidebars::Projects::Menus::RepositoryMenu')
diff --git a/lib/sidebars/projects/menus/security_compliance_menu.rb b/lib/sidebars/projects/menus/security_compliance_menu.rb
index 615fdd682af..6c9fb8312bd 100644
--- a/lib/sidebars/projects/menus/security_compliance_menu.rb
+++ b/lib/sidebars/projects/menus/security_compliance_menu.rb
@@ -61,4 +61,4 @@ module Sidebars
end
end
-Sidebars::Projects::Menus::SecurityComplianceMenu.prepend_if_ee('EE::Sidebars::Projects::Menus::SecurityComplianceMenu')
+Sidebars::Projects::Menus::SecurityComplianceMenu.prepend_mod_with('Sidebars::Projects::Menus::SecurityComplianceMenu')
diff --git a/lib/sidebars/projects/panel.rb b/lib/sidebars/projects/panel.rb
index 7a35c224cbf..261d51626cc 100644
--- a/lib/sidebars/projects/panel.rb
+++ b/lib/sidebars/projects/panel.rb
@@ -44,4 +44,4 @@ module Sidebars
end
end
-Sidebars::Projects::Panel.prepend_if_ee('EE::Sidebars::Projects::Panel')
+Sidebars::Projects::Panel.prepend_mod_with('Sidebars::Projects::Panel')
diff --git a/lib/system_check/rake_task/app_task.rb b/lib/system_check/rake_task/app_task.rb
index 99c93edd12d..f7d2bf86c78 100644
--- a/lib/system_check/rake_task/app_task.rb
+++ b/lib/system_check/rake_task/app_task.rb
@@ -40,4 +40,4 @@ module SystemCheck
end
end
-SystemCheck::RakeTask::AppTask.prepend_if_ee('EE::SystemCheck::RakeTask::AppTask')
+SystemCheck::RakeTask::AppTask.prepend_mod_with('SystemCheck::RakeTask::AppTask')
diff --git a/lib/system_check/rake_task/gitlab_task.rb b/lib/system_check/rake_task/gitlab_task.rb
index ae2a97c98e9..233acfefb4e 100644
--- a/lib/system_check/rake_task/gitlab_task.rb
+++ b/lib/system_check/rake_task/gitlab_task.rb
@@ -32,4 +32,4 @@ module SystemCheck
end
end
-SystemCheck::RakeTask::GitlabTask.prepend_if_ee('EE::SystemCheck::RakeTask::GitlabTask')
+SystemCheck::RakeTask::GitlabTask.prepend_mod_with('SystemCheck::RakeTask::GitlabTask')
diff --git a/qa/qa/page/admin/menu.rb b/qa/qa/page/admin/menu.rb
index 4c8ccc62c4f..e55e156fb8a 100644
--- a/qa/qa/page/admin/menu.rb
+++ b/qa/qa/page/admin/menu.rb
@@ -107,4 +107,4 @@ module QA
end
end
-QA::Page::Admin::Menu.prepend_if_ee('Page::Admin::Menu', namespace: QA)
+QA::Page::Admin::Menu.prepend_mod_with('Page::Admin::Menu', namespace: QA)
diff --git a/qa/qa/page/admin/overview/groups/edit.rb b/qa/qa/page/admin/overview/groups/edit.rb
index f63891be1c5..8e4650a1232 100644
--- a/qa/qa/page/admin/overview/groups/edit.rb
+++ b/qa/qa/page/admin/overview/groups/edit.rb
@@ -20,4 +20,4 @@ module QA
end
end
-QA::Page::Admin::Overview::Groups::Edit.prepend_if_ee('Page::Admin::Overview::Groups::Edit', namespace: QA)
+QA::Page::Admin::Overview::Groups::Edit.prepend_mod_with('Page::Admin::Overview::Groups::Edit', namespace: QA)
diff --git a/qa/qa/page/component/issue_board/show.rb b/qa/qa/page/component/issue_board/show.rb
index 8a87b130c0c..e0c8f73e1b0 100644
--- a/qa/qa/page/component/issue_board/show.rb
+++ b/qa/qa/page/component/issue_board/show.rb
@@ -137,4 +137,4 @@ module QA
end
end
-QA::Page::Component::IssueBoard::Show.prepend_if_ee('Page::Component::IssueBoard::Show', namespace: QA)
+QA::Page::Component::IssueBoard::Show.prepend_mod_with('Page::Component::IssueBoard::Show', namespace: QA)
diff --git a/qa/qa/page/dashboard/projects.rb b/qa/qa/page/dashboard/projects.rb
index 5416f09009f..8be11550233 100644
--- a/qa/qa/page/dashboard/projects.rb
+++ b/qa/qa/page/dashboard/projects.rb
@@ -45,4 +45,4 @@ module QA
end
end
-QA::Page::Dashboard::Projects.prepend_if_ee('Page::Dashboard::Projects', namespace: QA)
+QA::Page::Dashboard::Projects.prepend_mod_with('Page::Dashboard::Projects', namespace: QA)
diff --git a/qa/qa/page/file/show.rb b/qa/qa/page/file/show.rb
index f27119b6b5d..cefbbbcdba0 100644
--- a/qa/qa/page/file/show.rb
+++ b/qa/qa/page/file/show.rb
@@ -62,4 +62,4 @@ module QA
end
end
-QA::Page::File::Show.prepend_if_ee('Page::File::Show', namespace: QA)
+QA::Page::File::Show.prepend_mod_with('Page::File::Show', namespace: QA)
diff --git a/qa/qa/page/group/menu.rb b/qa/qa/page/group/menu.rb
index 97f4482d0c1..fced598a5c6 100644
--- a/qa/qa/page/group/menu.rb
+++ b/qa/qa/page/group/menu.rb
@@ -83,4 +83,4 @@ module QA
end
end
-QA::Page::Group::Menu.prepend_if_ee('Page::Group::Menu', namespace: QA)
+QA::Page::Group::Menu.prepend_mod_with('Page::Group::Menu', namespace: QA)
diff --git a/qa/qa/page/group/settings/general.rb b/qa/qa/page/group/settings/general.rb
index ec43d33c975..d2f039f57e0 100644
--- a/qa/qa/page/group/settings/general.rb
+++ b/qa/qa/page/group/settings/general.rb
@@ -129,4 +129,4 @@ module QA
end
end
-QA::Page::Group::Settings::General.prepend_if_ee('Page::Group::Settings::General', namespace: QA)
+QA::Page::Group::Settings::General.prepend_mod_with('Page::Group::Settings::General', namespace: QA)
diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb
index 656ccf75814..f796f4c9475 100644
--- a/qa/qa/page/main/menu.rb
+++ b/qa/qa/page/main/menu.rb
@@ -196,4 +196,4 @@ module QA
end
end
-QA::Page::Main::Menu.prepend_if_ee('Page::Main::Menu', namespace: QA)
+QA::Page::Main::Menu.prepend_mod_with('Page::Main::Menu', namespace: QA)
diff --git a/qa/qa/page/merge_request/new.rb b/qa/qa/page/merge_request/new.rb
index 023c001cd02..71e51ddd504 100644
--- a/qa/qa/page/merge_request/new.rb
+++ b/qa/qa/page/merge_request/new.rb
@@ -41,4 +41,4 @@ module QA
end
end
-QA::Page::MergeRequest::New.prepend_if_ee('Page::MergeRequest::New', namespace: QA)
+QA::Page::MergeRequest::New.prepend_mod_with('Page::MergeRequest::New', namespace: QA)
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index aec7ac6943f..7ae2b5605dc 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -390,4 +390,4 @@ module QA
end
end
-QA::Page::MergeRequest::Show.prepend_if_ee('Page::MergeRequest::Show', namespace: QA)
+QA::Page::MergeRequest::Show.prepend_mod_with('Page::MergeRequest::Show', namespace: QA)
diff --git a/qa/qa/page/milestone/show.rb b/qa/qa/page/milestone/show.rb
index f5975309597..0ab966534a3 100644
--- a/qa/qa/page/milestone/show.rb
+++ b/qa/qa/page/milestone/show.rb
@@ -30,4 +30,4 @@ module QA
end
end
-QA::Page::Milestone::Show.prepend_if_ee('Page::Milestone::Show', namespace: QA)
+QA::Page::Milestone::Show.prepend_mod_with('Page::Milestone::Show', namespace: QA)
diff --git a/qa/qa/page/profile/menu.rb b/qa/qa/page/profile/menu.rb
index fe039ea44e0..a12db2918dc 100644
--- a/qa/qa/page/profile/menu.rb
+++ b/qa/qa/page/profile/menu.rb
@@ -56,4 +56,4 @@ module QA
end
end
-QA::Page::Profile::Menu.prepend_if_ee('Page::Profile::Menu', namespace: QA)
+QA::Page::Profile::Menu.prepend_mod_with('Page::Profile::Menu', namespace: QA)
diff --git a/qa/qa/page/project/issue/index.rb b/qa/qa/page/project/issue/index.rb
index de0b2364d5f..fc46f7a2936 100644
--- a/qa/qa/page/project/issue/index.rb
+++ b/qa/qa/page/project/issue/index.rb
@@ -85,4 +85,4 @@ module QA
end
end
-QA::Page::Project::Issue::Index.prepend_if_ee('Page::Project::Issue::Index', namespace: QA)
+QA::Page::Project::Issue::Index.prepend_mod_with('Page::Project::Issue::Index', namespace: QA)
diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb
index 0e88a410fdd..7a5a153db86 100644
--- a/qa/qa/page/project/issue/show.rb
+++ b/qa/qa/page/project/issue/show.rb
@@ -70,4 +70,4 @@ module QA
end
end
-QA::Page::Project::Issue::Show.prepend_if_ee('Page::Project::Issue::Show', namespace: QA)
+QA::Page::Project::Issue::Show.prepend_mod_with('Page::Project::Issue::Show', namespace: QA)
diff --git a/qa/qa/page/project/job/show.rb b/qa/qa/page/project/job/show.rb
index 7214dded015..78b6bebe02e 100644
--- a/qa/qa/page/project/job/show.rb
+++ b/qa/qa/page/project/job/show.rb
@@ -75,4 +75,4 @@ module QA
end
end
-QA::Page::Project::Job::Show.prepend_if_ee('Page::Project::Job::Show', namespace: QA)
+QA::Page::Project::Job::Show.prepend_mod_with('Page::Project::Job::Show', namespace: QA)
diff --git a/qa/qa/page/project/menu.rb b/qa/qa/page/project/menu.rb
index c1a0f02d4ed..ffabaf30374 100644
--- a/qa/qa/page/project/menu.rb
+++ b/qa/qa/page/project/menu.rb
@@ -47,4 +47,4 @@ module QA
end
end
-QA::Page::Project::Menu.prepend_if_ee('Page::Project::Menu', namespace: QA)
+QA::Page::Project::Menu.prepend_mod_with('Page::Project::Menu', namespace: QA)
diff --git a/qa/qa/page/project/new.rb b/qa/qa/page/project/new.rb
index ae076e0bbe7..b14afa90442 100644
--- a/qa/qa/page/project/new.rb
+++ b/qa/qa/page/project/new.rb
@@ -84,4 +84,4 @@ module QA
end
end
-QA::Page::Project::New.prepend_if_ee('Page::Project::New', namespace: QA)
+QA::Page::Project::New.prepend_mod_with('Page::Project::New', namespace: QA)
diff --git a/qa/qa/page/project/operations/metrics/show.rb b/qa/qa/page/project/operations/metrics/show.rb
index 9e485bb2e15..22a7f1eed8f 100644
--- a/qa/qa/page/project/operations/metrics/show.rb
+++ b/qa/qa/page/project/operations/metrics/show.rb
@@ -134,4 +134,4 @@ module QA
end
end
-QA::Page::Project::Operations::Metrics::Show.prepend_if_ee('Page::Project::Operations::Metrics::Show', namespace: QA)
+QA::Page::Project::Operations::Metrics::Show.prepend_mod_with('Page::Project::Operations::Metrics::Show', namespace: QA)
diff --git a/qa/qa/page/project/packages/index.rb b/qa/qa/page/project/packages/index.rb
index 6c6448bb196..7794677b9b5 100644
--- a/qa/qa/page/project/packages/index.rb
+++ b/qa/qa/page/project/packages/index.rb
@@ -27,4 +27,4 @@ module QA
end
end
-QA::Page::Project::Packages::Index.prepend_if_ee('Page::Project::Packages::Index', namespace: QA)
+QA::Page::Project::Packages::Index.prepend_mod_with('Page::Project::Packages::Index', namespace: QA)
diff --git a/qa/qa/page/project/pipeline/index.rb b/qa/qa/page/project/pipeline/index.rb
index abb21bb38ce..f7c5d149593 100644
--- a/qa/qa/page/project/pipeline/index.rb
+++ b/qa/qa/page/project/pipeline/index.rb
@@ -67,4 +67,4 @@ module QA
end
end
-QA::Page::Project::Pipeline::Index.prepend_if_ee('Page::Project::Pipeline::Index', namespace: QA)
+QA::Page::Project::Pipeline::Index.prepend_mod_with('Page::Project::Pipeline::Index', namespace: QA)
diff --git a/qa/qa/page/project/pipeline/show.rb b/qa/qa/page/project/pipeline/show.rb
index 67e17131d7b..d45eeac46f6 100644
--- a/qa/qa/page/project/pipeline/show.rb
+++ b/qa/qa/page/project/pipeline/show.rb
@@ -117,4 +117,4 @@ module QA
end
end
-QA::Page::Project::Pipeline::Show.prepend_if_ee('Page::Project::Pipeline::Show', namespace: QA)
+QA::Page::Project::Pipeline::Show.prepend_mod_with('Page::Project::Pipeline::Show', namespace: QA)
diff --git a/qa/qa/page/project/settings/ci_cd.rb b/qa/qa/page/project/settings/ci_cd.rb
index d698fa20cf1..c537db34a51 100644
--- a/qa/qa/page/project/settings/ci_cd.rb
+++ b/qa/qa/page/project/settings/ci_cd.rb
@@ -43,4 +43,4 @@ module QA
end
end
-QA::Page::Project::Settings::CICD.prepend_if_ee("Page::Project::Settings::CICD", namespace: QA)
+QA::Page::Project::Settings::CICD.prepend_mod_with("Page::Project::Settings::CICD", namespace: QA)
diff --git a/qa/qa/page/project/settings/integrations.rb b/qa/qa/page/project/settings/integrations.rb
index 3ace478ab58..420dcb63918 100644
--- a/qa/qa/page/project/settings/integrations.rb
+++ b/qa/qa/page/project/settings/integrations.rb
@@ -23,4 +23,4 @@ module QA
end
end
-QA::Page::Project::Settings::Integrations.prepend_if_ee('Page::Project::Settings::Integrations', namespace: QA)
+QA::Page::Project::Settings::Integrations.prepend_mod_with('Page::Project::Settings::Integrations', namespace: QA)
diff --git a/qa/qa/page/project/settings/main.rb b/qa/qa/page/project/settings/main.rb
index c544bda5662..5efcb7bf23c 100644
--- a/qa/qa/page/project/settings/main.rb
+++ b/qa/qa/page/project/settings/main.rb
@@ -57,4 +57,4 @@ module QA
end
end
-QA::Page::Project::Settings::Main.prepend_if_ee("Page::Project::Settings::Main", namespace: QA)
+QA::Page::Project::Settings::Main.prepend_mod_with("Page::Project::Settings::Main", namespace: QA)
diff --git a/qa/qa/page/project/settings/merge_request.rb b/qa/qa/page/project/settings/merge_request.rb
index 781f3d4d5af..dbe804bfdd0 100644
--- a/qa/qa/page/project/settings/merge_request.rb
+++ b/qa/qa/page/project/settings/merge_request.rb
@@ -38,4 +38,4 @@ module QA
end
end
-QA::Page::Project::Settings::MergeRequest.prepend_if_ee("Page::Project::Settings::MergeRequest", namespace: QA)
+QA::Page::Project::Settings::MergeRequest.prepend_mod_with("Page::Project::Settings::MergeRequest", namespace: QA)
diff --git a/qa/qa/page/project/settings/mirroring_repositories.rb b/qa/qa/page/project/settings/mirroring_repositories.rb
index 1e47d4785f9..5e7b68858c8 100644
--- a/qa/qa/page/project/settings/mirroring_repositories.rb
+++ b/qa/qa/page/project/settings/mirroring_repositories.rb
@@ -129,4 +129,4 @@ module QA
end
end
-QA::Page::Project::Settings::MirroringRepositories.prepend_if_ee('Page::Project::Settings::MirroringRepositories', namespace: QA)
+QA::Page::Project::Settings::MirroringRepositories.prepend_mod_with('Page::Project::Settings::MirroringRepositories', namespace: QA)
diff --git a/qa/qa/page/project/settings/protected_branches.rb b/qa/qa/page/project/settings/protected_branches.rb
index e54012c0406..308cf6366a7 100644
--- a/qa/qa/page/project/settings/protected_branches.rb
+++ b/qa/qa/page/project/settings/protected_branches.rb
@@ -69,4 +69,4 @@ module QA
end
end
-QA::Page::Project::Settings::ProtectedBranches.prepend_if_ee('Page::Project::Settings::ProtectedBranches', namespace: QA)
+QA::Page::Project::Settings::ProtectedBranches.prepend_mod_with('Page::Project::Settings::ProtectedBranches', namespace: QA)
diff --git a/qa/qa/page/project/settings/protected_tags.rb b/qa/qa/page/project/settings/protected_tags.rb
index 090b677402f..d9f383154f9 100644
--- a/qa/qa/page/project/settings/protected_tags.rb
+++ b/qa/qa/page/project/settings/protected_tags.rb
@@ -43,4 +43,4 @@ module QA
end
end
-QA::Page::Project::Settings::ProtectedTags.prepend_if_ee('Page::Project::Settings::ProtectedTags', namespace: QA)
+QA::Page::Project::Settings::ProtectedTags.prepend_mod_with('Page::Project::Settings::ProtectedTags', namespace: QA)
diff --git a/qa/qa/page/project/settings/repository.rb b/qa/qa/page/project/settings/repository.rb
index b8a0b365195..a02b3d6a7d6 100644
--- a/qa/qa/page/project/settings/repository.rb
+++ b/qa/qa/page/project/settings/repository.rb
@@ -62,4 +62,4 @@ module QA
end
end
-QA::Page::Project::Settings::Repository.prepend_if_ee('Page::Project::Settings::Repository', namespace: QA)
+QA::Page::Project::Settings::Repository.prepend_mod_with('Page::Project::Settings::Repository', namespace: QA)
diff --git a/qa/qa/page/project/show.rb b/qa/qa/page/project/show.rb
index 7453326573f..c174d4b0c3f 100644
--- a/qa/qa/page/project/show.rb
+++ b/qa/qa/page/project/show.rb
@@ -180,4 +180,4 @@ module QA
end
end
-QA::Page::Project::Show.prepend_if_ee('Page::Project::Show', namespace: QA)
+QA::Page::Project::Show.prepend_mod_with('Page::Project::Show', namespace: QA)
diff --git a/qa/qa/page/project/snippet/index.rb b/qa/qa/page/project/snippet/index.rb
index 0c88c2cc6f9..fc677f96769 100644
--- a/qa/qa/page/project/snippet/index.rb
+++ b/qa/qa/page/project/snippet/index.rb
@@ -26,4 +26,4 @@ module QA
end
end
-QA::Page::Project::Snippet::Index.prepend_if_ee('Page::Project::Snippet::Index', namespace: QA)
+QA::Page::Project::Snippet::Index.prepend_mod_with('Page::Project::Snippet::Index', namespace: QA)
diff --git a/qa/qa/page/project/web_ide/edit.rb b/qa/qa/page/project/web_ide/edit.rb
index c6cd572a680..19791b07e77 100644
--- a/qa/qa/page/project/web_ide/edit.rb
+++ b/qa/qa/page/project/web_ide/edit.rb
@@ -331,4 +331,4 @@ module QA
end
end
-QA::Page::Project::WebIDE::Edit.prepend_if_ee('Page::Component::WebIDE::WebTerminalPanel', namespace: QA)
+QA::Page::Project::WebIDE::Edit.prepend_mod_with('Page::Component::WebIDE::WebTerminalPanel', namespace: QA)
diff --git a/qa/qa/page/project/wiki/show.rb b/qa/qa/page/project/wiki/show.rb
index 7120fdece76..ac42405563a 100644
--- a/qa/qa/page/project/wiki/show.rb
+++ b/qa/qa/page/project/wiki/show.rb
@@ -14,4 +14,4 @@ module QA
end
end
-QA::Page::Project::Wiki::Show.prepend_if_ee('Page::Project::Wiki::Show', namespace: QA)
+QA::Page::Project::Wiki::Show.prepend_mod_with('Page::Project::Wiki::Show', namespace: QA)
diff --git a/qa/qa/page/registration/welcome.rb b/qa/qa/page/registration/welcome.rb
index 72b5094fd0b..ff22e62b63e 100644
--- a/qa/qa/page/registration/welcome.rb
+++ b/qa/qa/page/registration/welcome.rb
@@ -21,4 +21,4 @@ module QA
end
end
-QA::Page::Registration::Welcome.prepend_if_ee('Page::Registration::Welcome', namespace: QA)
+QA::Page::Registration::Welcome.prepend_mod_with('Page::Registration::Welcome', namespace: QA)
diff --git a/qa/qa/runtime/env.rb b/qa/qa/runtime/env.rb
index f6ccbce5d37..e649084a394 100644
--- a/qa/qa/runtime/env.rb
+++ b/qa/qa/runtime/env.rb
@@ -403,4 +403,4 @@ module QA
end
end
-QA::Runtime::Env.extend_if_ee('Runtime::Env', namespace: QA)
+QA::Runtime::Env.extend_mod_with('Runtime::Env', namespace: QA)
diff --git a/qa/qa/scenario/test/sanity/selectors.rb b/qa/qa/scenario/test/sanity/selectors.rb
index 0da08ae03e2..8b355c5faf6 100644
--- a/qa/qa/scenario/test/sanity/selectors.rb
+++ b/qa/qa/scenario/test/sanity/selectors.rb
@@ -58,4 +58,4 @@ module QA
end
end
-QA::Scenario::Test::Sanity::Selectors.prepend_if_ee('Scenario::Test::Sanity::Selectors', namespace: QA)
+QA::Scenario::Test::Sanity::Selectors.prepend_mod_with('Scenario::Test::Sanity::Selectors', namespace: QA)
diff --git a/rubocop/cop/inject_enterprise_edition_module.rb b/rubocop/cop/inject_enterprise_edition_module.rb
index 16e4b647265..785f1494354 100644
--- a/rubocop/cop/inject_enterprise_edition_module.rb
+++ b/rubocop/cop/inject_enterprise_edition_module.rb
@@ -2,19 +2,19 @@
module RuboCop
module Cop
- # Cop that blacklists the injecting of EE specific modules before any lines which are not already injecting another module.
+ # Cop that blacklists the injecting of extension specific modules before any lines which are not already injecting another module.
# It allows multiple module injections as long as they're all at the end.
class InjectEnterpriseEditionModule < RuboCop::Cop::Cop
- INVALID_LINE = 'Injecting EE modules must be done on the last line of this file' \
+ INVALID_LINE = 'Injecting extension modules must be done on the last line of this file' \
', outside of any class or module definitions'
DISALLOWED_METHOD =
- 'EE modules must be injected using `include_if_ee`, `extend_if_ee`, or `prepend_if_ee`'
+ 'EE modules must be injected using `include_mod_with`, `extend_mod_with`, or `prepend_mod_with`'
- INVALID_ARGUMENT = 'EE modules to inject must be specified as a String'
+ INVALID_ARGUMENT = 'extension modules to inject must be specified as a String'
CHECK_LINE_METHODS =
- Set.new(%i[include_if_ee extend_if_ee prepend_if_ee]).freeze
+ Set.new(%i[include_mod_with extend_mod_with prepend_mod_with]).freeze
DISALLOW_METHODS = Set.new(%i[include extend prepend]).freeze
@@ -67,10 +67,10 @@ module RuboCop
def check_method?(node)
name = node.children[1]
- if CHECK_LINE_METHODS.include?(name) || DISALLOW_METHODS.include?(name)
+ if DISALLOW_METHODS.include?(name)
ee_const?(node.children[2])
else
- false
+ CHECK_LINE_METHODS.include?(name)
end
end
diff --git a/spec/config/inject_enterprise_edition_module_spec.rb b/spec/config/inject_enterprise_edition_module_spec.rb
index c65d909cc6b..61b40e46001 100644
--- a/spec/config/inject_enterprise_edition_module_spec.rb
+++ b/spec/config/inject_enterprise_edition_module_spec.rb
@@ -28,19 +28,7 @@ RSpec.describe InjectEnterpriseEditionModule do
it "calls #{method} with the extension module" do
expect(fish_class).to receive(method).with(fish_extension)
- fish_class.__send__("#{method}_if_ee", fish_name)
- end
-
- it "ignores EE prefix and calls #{method} with the extension module" do
- expect(fish_class).to receive(method).with(fish_extension)
-
- fish_class.__send__("#{method}_if_ee", "EE::#{fish_name}")
- end
-
- it "ignores ::EE prefix and calls #{method} with the extension module" do
- expect(fish_class).to receive(method).with(fish_extension)
-
- fish_class.__send__("#{method}_if_ee", "::EE::#{fish_name}")
+ fish_class.__send__("#{method}_mod_with", fish_name)
end
end
@@ -55,7 +43,7 @@ RSpec.describe InjectEnterpriseEditionModule do
it "calls #{method} with the extension module from the additional namespace" do
expect(fish_class).to receive(method).with(fish_extension)
- fish_class.__send__("#{method}_if_ee", fish_name, namespace: another_namespace)
+ fish_class.__send__("#{method}_mod_with", fish_name, namespace: another_namespace)
end
end
@@ -67,7 +55,7 @@ RSpec.describe InjectEnterpriseEditionModule do
it "does not call #{method}" do
expect(fish_class).not_to receive(method).with(fish_extension)
- fish_class.__send__("#{method}_if_ee", fish_name)
+ fish_class.__send__("#{method}_mod_with", fish_name)
end
end
@@ -75,7 +63,7 @@ RSpec.describe InjectEnterpriseEditionModule do
it "does not call #{method}" do
expect(fish_class).not_to receive(method).with(fish_extension)
- fish_class.__send__("#{method}_if_ee", fish_name)
+ fish_class.__send__("#{method}_mod_with", fish_name)
end
end
end
@@ -115,15 +103,15 @@ RSpec.describe InjectEnterpriseEditionModule do
end
end
- describe '#prepend_if_ee' do
+ describe '#prepend_mod_with' do
it_behaves_like 'expand the extension with', :prepend
end
- describe '#extend_if_ee' do
+ describe '#extend_mod_with' do
it_behaves_like 'expand the extension with', :extend
end
- describe '#include_if_ee' do
+ describe '#include_mod_with' do
it_behaves_like 'expand the extension with', :include
end
diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb
index 908d5741709..4d10b979c69 100644
--- a/spec/db/schema_spec.rb
+++ b/spec/db/schema_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
require Rails.root.join('ee', 'spec', 'db', 'schema_support') if Gitlab.ee?
RSpec.describe 'Database schema' do
- prepend_if_ee('EE::DB::SchemaSupport')
+ prepend_mod_with('DB::SchemaSupport')
let(:connection) { ActiveRecord::Base.connection }
let(:tables) { connection.tables }
diff --git a/spec/frontend/pipeline_editor/components/drawer/pipeline_editor_drawer_spec.js b/spec/frontend/pipeline_editor/components/drawer/pipeline_editor_drawer_spec.js
index fea7d90de52..1dfecf75ad8 100644
--- a/spec/frontend/pipeline_editor/components/drawer/pipeline_editor_drawer_spec.js
+++ b/spec/frontend/pipeline_editor/components/drawer/pipeline_editor_drawer_spec.js
@@ -1,16 +1,24 @@
import { GlButton } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils';
+import { nextTick } from 'vue';
+import { useLocalStorageSpy } from 'helpers/local_storage_helper';
import FirstPipelineCard from '~/pipeline_editor/components/drawer/cards/first_pipeline_card.vue';
import GettingStartedCard from '~/pipeline_editor/components/drawer/cards/getting_started_card.vue';
import PipelineConfigReferenceCard from '~/pipeline_editor/components/drawer/cards/pipeline_config_reference_card.vue';
import VisualizeAndLintCard from '~/pipeline_editor/components/drawer/cards/visualize_and_lint_card.vue';
import PipelineEditorDrawer from '~/pipeline_editor/components/drawer/pipeline_editor_drawer.vue';
+import { DRAWER_EXPANDED_KEY } from '~/pipeline_editor/constants';
+import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue';
describe('Pipeline editor drawer', () => {
+ useLocalStorageSpy();
+
let wrapper;
const createComponent = () => {
- wrapper = shallowMount(PipelineEditorDrawer);
+ wrapper = shallowMount(PipelineEditorDrawer, {
+ stubs: { LocalStorageSync },
+ });
};
const findFirstPipelineCard = () => wrapper.findComponent(FirstPipelineCard);
@@ -27,11 +35,13 @@ describe('Pipeline editor drawer', () => {
afterEach(() => {
wrapper.destroy();
+ localStorage.clear();
});
describe('when the drawer is collapsed', () => {
- beforeEach(() => {
+ beforeEach(async () => {
createComponent();
+ await clickToggleBtn();
});
it('shows the left facing arrow icon', () => {
@@ -58,7 +68,6 @@ describe('Pipeline editor drawer', () => {
describe('when the drawer is expanded', () => {
beforeEach(async () => {
createComponent();
- await clickToggleBtn();
});
it('shows the right facing arrow icon', () => {
@@ -88,4 +97,31 @@ describe('Pipeline editor drawer', () => {
expect(findDrawerContent().exists()).toBe(false);
});
});
+
+ describe('local storage', () => {
+ it('saves the drawer expanded value to local storage', async () => {
+ createComponent();
+ await clickToggleBtn();
+
+ expect(localStorage.setItem.mock.calls).toEqual([[DRAWER_EXPANDED_KEY, 'false']]);
+ });
+
+ it('loads the drawer collapsed when local storage is set to `false`, ', async () => {
+ localStorage.setItem(DRAWER_EXPANDED_KEY, false);
+ createComponent();
+
+ await nextTick();
+
+ expect(findDrawerContent().exists()).toBe(false);
+ });
+
+ it('loads the drawer expanded when local storage is set to `true`, ', async () => {
+ localStorage.setItem(DRAWER_EXPANDED_KEY, true);
+ createComponent();
+
+ await nextTick();
+
+ expect(findDrawerContent().exists()).toBe(true);
+ });
+ });
});
diff --git a/spec/frontend/pipeline_new/components/pipeline_new_form_spec.js b/spec/frontend/pipeline_new/components/pipeline_new_form_spec.js
index dc70db42b4a..2a3f4f56f36 100644
--- a/spec/frontend/pipeline_new/components/pipeline_new_form_spec.js
+++ b/spec/frontend/pipeline_new/components/pipeline_new_form_spec.js
@@ -1,13 +1,22 @@
import { GlForm, GlSprintf, GlLoadingIcon } from '@gitlab/ui';
import { mount, shallowMount } from '@vue/test-utils';
import MockAdapter from 'axios-mock-adapter';
+import CreditCardValidationRequiredAlert from 'ee_component/billings/components/cc_validation_required_alert.vue';
+import { TEST_HOST } from 'helpers/test_constants';
import waitForPromises from 'helpers/wait_for_promises';
import axios from '~/lib/utils/axios_utils';
import httpStatusCodes from '~/lib/utils/http_status';
import { redirectTo } from '~/lib/utils/url_utility';
import PipelineNewForm from '~/pipeline_new/components/pipeline_new_form.vue';
import RefsDropdown from '~/pipeline_new/components/refs_dropdown.vue';
-import { mockQueryParams, mockPostParams, mockProjectId, mockError, mockRefs } from '../mock_data';
+import {
+ mockQueryParams,
+ mockPostParams,
+ mockProjectId,
+ mockError,
+ mockRefs,
+ mockCreditCardValidationRequiredError,
+} from '../mock_data';
jest.mock('~/lib/utils/url_utility', () => ({
redirectTo: jest.fn(),
@@ -376,6 +385,32 @@ describe('Pipeline New Form', () => {
it('re-enables the submit button', () => {
expect(findSubmitButton().props('disabled')).toBe(false);
});
+
+ it('does not show the credit card validation required alert', () => {
+ expect(wrapper.findComponent(CreditCardValidationRequiredAlert).exists()).toBe(false);
+ });
+
+ describe('when the error response is credit card validation required', () => {
+ beforeEach(async () => {
+ mock
+ .onPost(pipelinesPath)
+ .reply(httpStatusCodes.BAD_REQUEST, mockCreditCardValidationRequiredError);
+
+ window.gon = {
+ subscriptions_url: TEST_HOST,
+ payment_form_url: TEST_HOST,
+ };
+
+ findForm().vm.$emit('submit', dummySubmitEvent);
+
+ await waitForPromises();
+ });
+
+ it('shows credit card validation required alert', () => {
+ expect(findErrorAlert().exists()).toBe(false);
+ expect(wrapper.findComponent(CreditCardValidationRequiredAlert).exists()).toBe(true);
+ });
+ });
});
describe('when the error response cannot be handled', () => {
diff --git a/spec/frontend/pipeline_new/mock_data.js b/spec/frontend/pipeline_new/mock_data.js
index 3174b73098a..e99684ff417 100644
--- a/spec/frontend/pipeline_new/mock_data.js
+++ b/spec/frontend/pipeline_new/mock_data.js
@@ -40,6 +40,12 @@ export const mockError = {
total_warnings: 7,
};
+export const mockCreditCardValidationRequiredError = {
+ errors: ['Credit card required to be on file in order to create a pipeline'],
+ warnings: [],
+ total_warnings: 0,
+};
+
export const mockBranchRefs = ['main', 'dev', 'release'];
export const mockTagRefs = ['1.0.0', '1.1.0', '1.2.0'];
diff --git a/spec/lib/gitlab/ci/templates/templates_spec.rb b/spec/lib/gitlab/ci/templates/templates_spec.rb
index 768256ee6b3..56443e611e8 100644
--- a/spec/lib/gitlab/ci/templates/templates_spec.rb
+++ b/spec/lib/gitlab/ci/templates/templates_spec.rb
@@ -22,14 +22,34 @@ RSpec.describe 'CI YML Templates' do
with_them do
let(:content) do
- <<~EOS
- include:
- - template: #{template_name}
+ if template_name == 'Security/DAST-API.gitlab-ci.yml'
+ # The DAST-API template purposly excludes a stages
+ # definition.
- concrete_build_implemented_by_a_user:
- stage: test
- script: do something
- EOS
+ <<~EOS
+ include:
+ - template: #{template_name}
+
+ stages:
+ - build
+ - test
+ - deploy
+ - dast
+
+ concrete_build_implemented_by_a_user:
+ stage: test
+ script: do something
+ EOS
+ else
+ <<~EOS
+ include:
+ - template: #{template_name}
+
+ concrete_build_implemented_by_a_user:
+ stage: test
+ script: do something
+ EOS
+ end
end
it 'is valid' do
diff --git a/spec/rubocop/cop/inject_enterprise_edition_module_spec.rb b/spec/rubocop/cop/inject_enterprise_edition_module_spec.rb
index 8bfa57031d7..962efc23453 100644
--- a/spec/rubocop/cop/inject_enterprise_edition_module_spec.rb
+++ b/spec/rubocop/cop/inject_enterprise_edition_module_spec.rb
@@ -6,173 +6,77 @@ require_relative '../../../rubocop/cop/inject_enterprise_edition_module'
RSpec.describe RuboCop::Cop::InjectEnterpriseEditionModule do
subject(:cop) { described_class.new }
- it 'flags the use of `prepend_if_ee EE` in the middle of a file' do
+ it 'flags the use of `prepend_mod_with` in the middle of a file' do
expect_offense(<<~SOURCE)
class Foo
- prepend_if_ee 'EE::Foo'
- ^^^^^^^^^^^^^^^^^^^^^^^ Injecting EE modules must be done on the last line of this file, outside of any class or module definitions
+ prepend_mod_with('Foo')
+ ^^^^^^^^^^^^^^^^^^^^^^^ Injecting extension modules must be done on the last line of this file, outside of any class or module definitions
end
SOURCE
end
- it 'flags the use of `prepend_if_ee QA::EE` in the middle of a file' do
+ it 'flags the use of `include_mod_with` in the middle of a file' do
expect_offense(<<~SOURCE)
class Foo
- prepend_if_ee 'QA::EE::Foo'
- ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Injecting EE modules must be done on the last line of this file, outside of any class or module definitions
+ include_mod_with('Foo')
+ ^^^^^^^^^^^^^^^^^^^^^^^ Injecting extension modules must be done on the last line of this file, outside of any class or module definitions
end
SOURCE
end
-
- it 'does not flag the use of `prepend_if_ee EEFoo` in the middle of a file' do
- expect_no_offenses(<<~SOURCE)
- class Foo
- prepend_if_ee 'EEFoo'
- end
- SOURCE
- end
-
- it 'flags the use of `prepend_if_ee EE::Foo::Bar` in the middle of a file' do
+ it 'flags the use of `extend_mod_with` in the middle of a file' do
expect_offense(<<~SOURCE)
class Foo
- prepend_if_ee 'EE::Foo::Bar'
- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Injecting EE modules must be done on the last line of this file, outside of any class or module definitions
+ extend_mod_with('Foo')
+ ^^^^^^^^^^^^^^^^^^^^^^ Injecting extension modules must be done on the last line of this file, outside of any class or module definitions
end
SOURCE
end
- it 'flags the use of `prepend_if_ee(EE::Foo::Bar)` in the middle of a file' do
- expect_offense(<<~SOURCE)
- class Foo
- prepend_if_ee('EE::Foo::Bar')
- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Injecting EE modules must be done on the last line of this file, outside of any class or module definitions
- end
- SOURCE
- end
-
- it 'flags the use of `prepend_if_ee EE::Foo::Bar::Baz` in the middle of a file' do
- expect_offense(<<~SOURCE)
- class Foo
- prepend_if_ee 'EE::Foo::Bar::Baz'
- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Injecting EE modules must be done on the last line of this file, outside of any class or module definitions
- end
- SOURCE
- end
-
- it 'flags the use of `prepend_if_ee ::EE` in the middle of a file' do
- expect_offense(<<~SOURCE)
- class Foo
- prepend_if_ee '::EE::Foo'
- ^^^^^^^^^^^^^^^^^^^^^^^^^ Injecting EE modules must be done on the last line of this file, outside of any class or module definitions
- end
- SOURCE
- end
-
- it 'flags the use of `include_if_ee EE` in the middle of a file' do
- expect_offense(<<~SOURCE)
- class Foo
- include_if_ee 'EE::Foo'
- ^^^^^^^^^^^^^^^^^^^^^^^ Injecting EE modules must be done on the last line of this file, outside of any class or module definitions
- end
- SOURCE
- end
-
- it 'flags the use of `include_if_ee ::EE` in the middle of a file' do
- expect_offense(<<~SOURCE)
- class Foo
- include_if_ee '::EE::Foo'
- ^^^^^^^^^^^^^^^^^^^^^^^^^ Injecting EE modules must be done on the last line of this file, outside of any class or module definitions
- end
- SOURCE
- end
-
- it 'flags the use of `extend_if_ee EE` in the middle of a file' do
- expect_offense(<<~SOURCE)
- class Foo
- extend_if_ee 'EE::Foo'
- ^^^^^^^^^^^^^^^^^^^^^^ Injecting EE modules must be done on the last line of this file, outside of any class or module definitions
- end
- SOURCE
- end
-
- it 'flags the use of `extend_if_ee ::EE` in the middle of a file' do
- expect_offense(<<~SOURCE)
- class Foo
- extend_if_ee '::EE::Foo'
- ^^^^^^^^^^^^^^^^^^^^^^^^ Injecting EE modules must be done on the last line of this file, outside of any class or module definitions
- end
- SOURCE
- end
-
- it 'does not flag prepending of regular modules' do
- expect_no_offenses(<<~SOURCE)
- class Foo
- prepend_if_ee 'Foo'
- end
- SOURCE
- end
-
- it 'does not flag including of regular modules' do
- expect_no_offenses(<<~SOURCE)
- class Foo
- include_if_ee 'Foo'
- end
- SOURCE
- end
-
- it 'does not flag extending using regular modules' do
- expect_no_offenses(<<~SOURCE)
- class Foo
- extend_if_ee 'Foo'
- end
- SOURCE
- end
-
- it 'does not flag the use of `prepend_if_ee EE` on the last line' do
+ it 'does not flag the use of `prepend_mod_with` on the last line' do
expect_no_offenses(<<~SOURCE)
class Foo
end
- Foo.prepend_if_ee('EE::Foo')
+ Foo.prepend_mod_with('Foo')
SOURCE
end
- it 'does not flag the use of `include_if_ee EE` on the last line' do
+ it 'does not flag the use of `include_mod_with` on the last line' do
expect_no_offenses(<<~SOURCE)
class Foo
end
- Foo.include_if_ee('EE::Foo')
+ Foo.include_mod_with('Foo')
SOURCE
end
- it 'does not flag the use of `extend_if_ee EE` on the last line' do
+ it 'does not flag the use of `extend_mod_with` on the last line' do
expect_no_offenses(<<~SOURCE)
class Foo
end
- Foo.extend_if_ee('EE::Foo')
+ Foo.extend_mod_with('Foo')
SOURCE
end
- it 'does not flag the double use of `X_if_ee` on the last line' do
+ it 'does not flag the double use of `X_mod_with` on the last line' do
expect_no_offenses(<<~SOURCE)
class Foo
end
- Foo.extend_if_ee('EE::Foo')
- Foo.include_if_ee('EE::Foo')
- Foo.prepend_if_ee('EE::Foo')
+ Foo.extend_mod_with('Foo')
+ Foo.include_mod_with('Foo')
+ Foo.prepend_mod_with('Foo')
SOURCE
end
- it 'does not flag the use of `prepend_if_ee EE` as long as all injections are at the end of the file' do
+ it 'does not flag the use of `prepend_mod_with` as long as all injections are at the end of the file' do
expect_no_offenses(<<~SOURCE)
class Foo
end
- Foo.include_if_ee('EE::Foo')
- Foo.prepend_if_ee('EE::Foo')
+ Foo.include_mod_with('Foo')
+ Foo.prepend_mod_with('Foo')
Foo.include(Bar)
# comment on prepending Bar
@@ -183,27 +87,27 @@ RSpec.describe RuboCop::Cop::InjectEnterpriseEditionModule do
it 'autocorrects offenses by just disabling the Cop' do
expect_offense(<<~SOURCE)
class Foo
- prepend_if_ee 'EE::Foo'
- ^^^^^^^^^^^^^^^^^^^^^^^ Injecting EE modules must be done on the last line of this file, outside of any class or module definitions
- include_if_ee 'Bar'
+ prepend_mod_with('Foo')
+ ^^^^^^^^^^^^^^^^^^^^^^^ Injecting extension modules must be done on the last line of this file, outside of any class or module definitions
+ include Bar
end
SOURCE
expect_correction(<<~SOURCE)
class Foo
- prepend_if_ee 'EE::Foo' # rubocop: disable Cop/InjectEnterpriseEditionModule
- include_if_ee 'Bar'
+ prepend_mod_with('Foo') # rubocop: disable Cop/InjectEnterpriseEditionModule
+ include Bar
end
SOURCE
end
- it 'disallows the use of prepend to inject an EE module' do
+ it 'disallows the use of prepend to inject an extension module' do
expect_offense(<<~SOURCE)
class Foo
end
Foo.prepend(EE::Foo)
- ^^^^^^^^^^^^^^^^^^^^ EE modules must be injected using `include_if_ee`, `extend_if_ee`, or `prepend_if_ee`
+ ^^^^^^^^^^^^^^^^^^^^ EE modules must be injected using `include_mod_with`, `extend_mod_with`, or `prepend_mod_with`
SOURCE
end
@@ -213,7 +117,7 @@ RSpec.describe RuboCop::Cop::InjectEnterpriseEditionModule do
end
Foo.prepend(QA::EE::Foo)
- ^^^^^^^^^^^^^^^^^^^^^^^^ EE modules must be injected using `include_if_ee`, `extend_if_ee`, or `prepend_if_ee`
+ ^^^^^^^^^^^^^^^^^^^^^^^^ EE modules must be injected using `include_mod_with`, `extend_mod_with`, or `prepend_mod_with`
SOURCE
end
@@ -223,7 +127,7 @@ RSpec.describe RuboCop::Cop::InjectEnterpriseEditionModule do
end
Foo.extend(EE::Foo)
- ^^^^^^^^^^^^^^^^^^^ EE modules must be injected using `include_if_ee`, `extend_if_ee`, or `prepend_if_ee`
+ ^^^^^^^^^^^^^^^^^^^ EE modules must be injected using `include_mod_with`, `extend_mod_with`, or `prepend_mod_with`
SOURCE
end
@@ -233,37 +137,37 @@ RSpec.describe RuboCop::Cop::InjectEnterpriseEditionModule do
end
Foo.include(EE::Foo)
- ^^^^^^^^^^^^^^^^^^^^ EE modules must be injected using `include_if_ee`, `extend_if_ee`, or `prepend_if_ee`
+ ^^^^^^^^^^^^^^^^^^^^ EE modules must be injected using `include_mod_with`, `extend_mod_with`, or `prepend_mod_with`
SOURCE
end
- it 'disallows the use of prepend_if_ee without a String' do
+ it 'disallows the use of prepend_mod_with without a String' do
expect_offense(<<~SOURCE)
class Foo
end
- Foo.prepend_if_ee(EE::Foo)
- ^^^^^^^ EE modules to inject must be specified as a String
+ Foo.prepend_mod_with(Foo)
+ ^^^ extension modules to inject must be specified as a String
SOURCE
end
- it 'disallows the use of include_if_ee without a String' do
+ it 'disallows the use of include_mod_with without a String' do
expect_offense(<<~SOURCE)
class Foo
end
- Foo.include_if_ee(EE::Foo)
- ^^^^^^^ EE modules to inject must be specified as a String
+ Foo.include_mod_with(Foo)
+ ^^^ extension modules to inject must be specified as a String
SOURCE
end
- it 'disallows the use of extend_if_ee without a String' do
+ it 'disallows the use of extend_mod_with without a String' do
expect_offense(<<~SOURCE)
class Foo
end
- Foo.extend_if_ee(EE::Foo)
- ^^^^^^^ EE modules to inject must be specified as a String
+ Foo.extend_mod_with(Foo)
+ ^^^ extension modules to inject must be specified as a String
SOURCE
end
end
diff --git a/spec/support/db_cleaner.rb b/spec/support/db_cleaner.rb
index 77e1f6bcaa3..ff913ebf22b 100644
--- a/spec/support/db_cleaner.rb
+++ b/spec/support/db_cleaner.rb
@@ -16,4 +16,4 @@ module DbCleaner
end
end
-DbCleaner.prepend_if_ee('EE::DbCleaner')
+DbCleaner.prepend_mod_with('DbCleaner')
diff --git a/spec/support/helpers/ldap_helpers.rb b/spec/support/helpers/ldap_helpers.rb
index 8154e3a4fc9..2f5f8be518c 100644
--- a/spec/support/helpers/ldap_helpers.rb
+++ b/spec/support/helpers/ldap_helpers.rb
@@ -71,4 +71,4 @@ module LdapHelpers
end
end
-LdapHelpers.include_if_ee('EE::LdapHelpers')
+LdapHelpers.include_mod_with('LdapHelpers')
diff --git a/spec/support/helpers/license_helper.rb b/spec/support/helpers/license_helper.rb
index a1defba9ccb..61afb2171f0 100644
--- a/spec/support/helpers/license_helper.rb
+++ b/spec/support/helpers/license_helper.rb
@@ -7,4 +7,4 @@ module LicenseHelpers
end
end
-LicenseHelpers.prepend_if_ee('EE::LicenseHelpers')
+LicenseHelpers.prepend_mod_with('LicenseHelpers')
diff --git a/spec/support/helpers/login_helpers.rb b/spec/support/helpers/login_helpers.rb
index 86022e16d71..fc3eb976276 100644
--- a/spec/support/helpers/login_helpers.rb
+++ b/spec/support/helpers/login_helpers.rb
@@ -237,4 +237,4 @@ module LoginHelpers
end
end
-LoginHelpers.prepend_if_ee('EE::LoginHelpers')
+LoginHelpers.prepend_mod_with('LoginHelpers')
diff --git a/spec/support/helpers/migrations_helpers.rb b/spec/support/helpers/migrations_helpers.rb
index 2c31a608b35..fa50b234bd5 100644
--- a/spec/support/helpers/migrations_helpers.rb
+++ b/spec/support/helpers/migrations_helpers.rb
@@ -172,4 +172,4 @@ module MigrationsHelpers
end
end
-MigrationsHelpers.prepend_if_ee('EE::MigrationsHelpers')
+MigrationsHelpers.prepend_mod_with('MigrationsHelpers')
diff --git a/spec/support/helpers/require_migration.rb b/spec/support/helpers/require_migration.rb
index b5313e78f5d..8de71d3073f 100644
--- a/spec/support/helpers/require_migration.rb
+++ b/spec/support/helpers/require_migration.rb
@@ -41,7 +41,7 @@ class RequireMigration
end
end
-RequireMigration.prepend_if_ee('EE::RequireMigration')
+RequireMigration.prepend_mod_with('RequireMigration')
def require_migration!(file_name = nil)
location_info = caller_locations.first.path.match(RequireMigration::SPEC_FILE_PATTERN)
diff --git a/spec/support/helpers/stub_configuration.rb b/spec/support/helpers/stub_configuration.rb
index 9851a3de9e9..8c60dc30cdb 100644
--- a/spec/support/helpers/stub_configuration.rb
+++ b/spec/support/helpers/stub_configuration.rb
@@ -163,4 +163,4 @@ end
require_relative '../../../ee/spec/support/helpers/ee/stub_configuration' if
Dir.exist?("#{__dir__}/../../../ee")
-StubConfiguration.prepend_if_ee('EE::StubConfiguration')
+StubConfiguration.prepend_mod_with('StubConfiguration')
diff --git a/spec/support/helpers/stub_gitlab_calls.rb b/spec/support/helpers/stub_gitlab_calls.rb
index 4da8f760056..3824ff2b68d 100644
--- a/spec/support/helpers/stub_gitlab_calls.rb
+++ b/spec/support/helpers/stub_gitlab_calls.rb
@@ -153,4 +153,4 @@ module StubGitlabCalls
end
end
-StubGitlabCalls.prepend_if_ee('EE::StubGitlabCalls')
+StubGitlabCalls.prepend_mod_with('StubGitlabCalls')
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb
index 05e3b408f33..40a3dbfbf25 100644
--- a/spec/support/helpers/test_env.rb
+++ b/spec/support/helpers/test_env.rb
@@ -612,5 +612,5 @@ end
require_relative('../../../ee/spec/support/helpers/ee/test_env') if Gitlab.ee?
-::TestEnv.prepend_if_ee('::EE::TestEnv')
-::TestEnv.extend_if_ee('::EE::TestEnv')
+::TestEnv.prepend_mod_with('TestEnv')
+::TestEnv.extend_mod_with('TestEnv')
diff --git a/spec/support/matchers/markdown_matchers.rb b/spec/support/matchers/markdown_matchers.rb
index 47cffad8c41..dfdb5bc01ae 100644
--- a/spec/support/matchers/markdown_matchers.rb
+++ b/spec/support/matchers/markdown_matchers.rb
@@ -291,4 +291,4 @@ module RSpec::Matchers::DSL::Macros
end
end
-MarkdownMatchers.prepend_if_ee('EE::MarkdownMatchers')
+MarkdownMatchers.prepend_mod_with('MarkdownMatchers')