Add latest changes from gitlab-org/gitlab@master

2021-05-11 21:10:21 +00:00 · 2021-05-11 21:10:21 +00:00 · 0ae8428c8e
parent f020d5dc9b
commit 0ae8428c8e
838 changed files with 1124 additions and 1125 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-4a1b0d4018ee35cfe786ba3dd975b20013a39e39
+8d525bfb986a26ee6c1c6d0ec976fa2614928cf8
--- 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 @@
 <script>
 import { GlButton, GlIcon } from '@gitlab/ui';
 import { __ } from '~/locale';
+import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue';
+import { DRAWER_EXPANDED_KEY } from '../../constants';
 import FirstPipelineCard from './cards/first_pipeline_card.vue';
 import GettingStartedCard from './cards/getting_started_card.vue';
 import PipelineConfigReferenceCard from './cards/pipeline_config_reference_card.vue';
@ -14,17 +16,19 @@ export default {
  i18n: {
    toggleTxt: __('Collapse'),
  },
+  localDrawerKey: DRAWER_EXPANDED_KEY,
  components: {
    FirstPipelineCard,
    GettingStartedCard,
-    PipelineConfigReferenceCard,
-    VisualizeAndLintCard,
    GlButton,
    GlIcon,
+    LocalStorageSync,
+    PipelineConfigReferenceCard,
+    VisualizeAndLintCard,
  },
  data() {
    return {
-      isExpanded: false,
+      isExpanded: true,
      topPosition: 0,
    };
  },
@ -61,29 +65,31 @@ export default {
 };
 </script>
 <template>
-  <aside
-    aria-live="polite"
-    class="gl-fixed gl-right-0 gl-bg-gray-10 gl-shadow-drawer gl-transition-medium gl-border-l-solid gl-border-1 gl-border-gray-100 gl-h-full gl-z-index-9999 gl-overflow-y-auto"
-    :style="rootStyle"
-  >
-    <gl-button
-      category="tertiary"
-      class="gl-w-full gl-h-9 gl-rounded-0! gl-border-none! gl-border-b-solid! gl-border-1! gl-border-gray-100 gl-text-decoration-none! gl-outline-0! gl-display-flex"
-      :class="buttonClass"
-      :title="__('Toggle sidebar')"
-      @click="toggleDrawer"
+  <local-storage-sync v-model="isExpanded" :storage-key="$options.localDrawerKey" as-json>
+    <aside
+      aria-live="polite"
+      class="gl-fixed gl-right-0 gl-bg-gray-10 gl-shadow-drawer gl-transition-medium gl-border-l-solid gl-border-1 gl-border-gray-100 gl-h-full gl-z-index-9999 gl-overflow-y-auto"
+      :style="rootStyle"
    >
-      <span v-if="isExpanded" class="gl-text-gray-500 gl-mr-3" data-testid="collapse-text">
-        {{ __('Collapse') }}
-      </span>
-      <gl-icon data-testid="toggle-icon" :name="buttonIconName" />
-    </gl-button>
-    <div v-if="isExpanded" class="gl-h-full gl-p-5" data-testid="drawer-content">
-      <getting-started-card class="gl-mb-4" />
-      <first-pipeline-card class="gl-mb-4" />
-      <visualize-and-lint-card class="gl-mb-4" />
-      <pipeline-config-reference-card />
-      <div class="gl-h-13"></div>
-    </div>
-  </aside>
+      <gl-button
+        category="tertiary"
+        class="gl-w-full gl-h-9 gl-rounded-0! gl-border-none! gl-border-b-solid! gl-border-1! gl-border-gray-100 gl-text-decoration-none! gl-outline-0! gl-display-flex"
+        :class="buttonClass"
+        :title="__('Toggle sidebar')"
+        @click="toggleDrawer"
+      >
+        <span v-if="isExpanded" class="gl-text-gray-500 gl-mr-3" data-testid="collapse-text">
+          {{ __('Collapse') }}
+        </span>
+        <gl-icon data-testid="toggle-icon" :name="buttonIconName" />
+      </gl-button>
+      <div v-if="isExpanded" class="gl-h-full gl-p-5" data-testid="drawer-content">
+        <getting-started-card class="gl-mb-4" />
+        <first-pipeline-card class="gl-mb-4" />
+        <visualize-and-lint-card class="gl-mb-4" />
+        <pipeline-config-reference-card />
+        <div class="gl-h-13"></div>
+      </div>
+    </aside>
+  </local-storage-sync>
 </template>
--- 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';
--- 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 {

 <template>
  <gl-form @submit.prevent="createPipeline">
+    <cc-validation-required-alert v-if="ccRequiredError" class="gl-pb-5" />
    <gl-alert
-      v-if="error"
+      v-else-if="error"
      :title="errorTitle"
      :dismissible="false"
      variant="danger"
--- a/app/assets/javascripts/pipeline_new/constants.js
+++ b/app/assets/javascripts/pipeline_new/constants.js
@ -4,3 +4,6 @@ export const DEBOUNCE_REFS_SEARCH_MS = 250;
 export const CONFIG_VARIABLES_TIMEOUT = 5000;
 export const BRANCH_REF_TYPE = 'branch';
 export const TAG_REF_TYPE = 'tag';
+
+export const CC_VALIDATION_REQUIRED_ERROR =
+  'Credit card required to be on file in order to create a pipeline';
--- a/app/controllers/admin/application_controller.rb
+++ b/app/controllers/admin/application_controller.rb
@ -9,4 +9,4 @@ class Admin::ApplicationController < ApplicationController
  layout 'admin'
 end

-Admin::ApplicationController.prepend_if_ee('EE::Admin::ApplicationController')
+Admin::ApplicationController.prepend_mod_with('Admin::ApplicationController')
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@ -292,4 +292,4 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
  end
 end

-Admin::ApplicationSettingsController.prepend_if_ee('EE::Admin::ApplicationSettingsController')
+Admin::ApplicationSettingsController.prepend_mod_with('Admin::ApplicationSettingsController')
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@ -24,4 +24,4 @@ class Admin::DashboardController < Admin::ApplicationController
  end
 end

-Admin::DashboardController.prepend_if_ee('EE::Admin::DashboardController')
+Admin::DashboardController.prepend_mod_with('Admin::DashboardController')
--- a/app/controllers/admin/dev_ops_report_controller.rb
+++ b/app/controllers/admin/dev_ops_report_controller.rb
@ -24,4 +24,4 @@ class Admin::DevOpsReportController < Admin::ApplicationController
  end
 end

-Admin::DevOpsReportController.prepend_if_ee('EE::Admin::DevOpsReportController')
+Admin::DevOpsReportController.prepend_mod_with('Admin::DevOpsReportController')
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@ -117,4 +117,4 @@ class Admin::GroupsController < Admin::ApplicationController
  end
 end

-Admin::GroupsController.prepend_if_ee('EE::Admin::GroupsController')
+Admin::GroupsController.prepend_mod_with('Admin::GroupsController')
--- a/app/controllers/admin/health_check_controller.rb
+++ b/app/controllers/admin/health_check_controller.rb
@ -14,4 +14,4 @@ class Admin::HealthCheckController < Admin::ApplicationController
  end
 end

-Admin::HealthCheckController.prepend_if_ee('EE::Admin::HealthCheckController')
+Admin::HealthCheckController.prepend_mod_with('Admin::HealthCheckController')
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@ -89,4 +89,4 @@ class Admin::ProjectsController < Admin::ApplicationController
  end
 end

-Admin::ProjectsController.prepend_if_ee('EE::Admin::ProjectsController')
+Admin::ProjectsController.prepend_mod_with('Admin::ProjectsController')
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@ -344,4 +344,4 @@ class Admin::UsersController < Admin::ApplicationController
  end
 end

-Admin::UsersController.prepend_if_ee('EE::Admin::UsersController')
+Admin::UsersController.prepend_mod_with('Admin::UsersController')
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -556,4 +556,4 @@ class ApplicationController < ActionController::Base
  end
 end

-ApplicationController.prepend_ee_mod
+ApplicationController.prepend_mod
--- a/app/controllers/autocomplete_controller.rb
+++ b/app/controllers/autocomplete_controller.rb
@ -71,4 +71,4 @@ class AutocompleteController < ApplicationController
  end
 end

-AutocompleteController.prepend_if_ee('EE::AutocompleteController')
+AutocompleteController.prepend_mod_with('AutocompleteController')
--- a/app/controllers/boards/issues_controller.rb
+++ b/app/controllers/boards/issues_controller.rb
@ -158,4 +158,4 @@ module Boards
  end
 end

-Boards::IssuesController.prepend_if_ee('EE::Boards::IssuesController')
+Boards::IssuesController.prepend_mod_with('Boards::IssuesController')
--- a/app/controllers/boards/lists_controller.rb
+++ b/app/controllers/boards/lists_controller.rb
@ -99,4 +99,4 @@ module Boards
  end
 end

-Boards::ListsController.prepend_if_ee('EE::Boards::ListsController')
+Boards::ListsController.prepend_mod_with('Boards::ListsController')
--- a/app/controllers/clusters/clusters_controller.rb
+++ b/app/controllers/clusters/clusters_controller.rb
@ -362,4 +362,4 @@ class Clusters::ClustersController < Clusters::BaseController
  end
 end

-Clusters::ClustersController.prepend_if_ee('EE::Clusters::ClustersController')
+Clusters::ClustersController.prepend_mod_with('Clusters::ClustersController')
--- a/app/controllers/concerns/authenticates_with_two_factor.rb
+++ b/app/controllers/concerns/authenticates_with_two_factor.rb
@ -177,4 +177,4 @@ module AuthenticatesWithTwoFactor
  end
 end

-AuthenticatesWithTwoFactor.prepend_if_ee('EE::AuthenticatesWithTwoFactor')
+AuthenticatesWithTwoFactor.prepend_mod_with('AuthenticatesWithTwoFactor')
--- a/app/controllers/concerns/boards_actions.rb
+++ b/app/controllers/concerns/boards_actions.rb
@ -65,4 +65,4 @@ module BoardsActions
  end
 end

-BoardsActions.prepend_if_ee('EE::BoardsActions')
+BoardsActions.prepend_mod_with('BoardsActions')
--- a/app/controllers/concerns/boards_responses.rb
+++ b/app/controllers/concerns/boards_responses.rb
@ -91,4 +91,4 @@ module BoardsResponses
  end
 end

-BoardsResponses.prepend_if_ee('EE::BoardsResponses')
+BoardsResponses.prepend_mod_with('BoardsResponses')
--- a/app/controllers/concerns/cycle_analytics_params.rb
+++ b/app/controllers/concerns/cycle_analytics_params.rb
@ -43,4 +43,4 @@ module CycleAnalyticsParams
  end
 end

-CycleAnalyticsParams.prepend_if_ee('EE::CycleAnalyticsParams')
+CycleAnalyticsParams.prepend_mod_with('CycleAnalyticsParams')
--- a/app/controllers/concerns/enforces_two_factor_authentication.rb
+++ b/app/controllers/concerns/enforces_two_factor_authentication.rb
@ -72,4 +72,4 @@ module EnforcesTwoFactorAuthentication
  end
 end

-EnforcesTwoFactorAuthentication.prepend_if_ee('EE::EnforcesTwoFactorAuthentication')
+EnforcesTwoFactorAuthentication.prepend_mod_with('EnforcesTwoFactorAuthentication')
--- a/app/controllers/concerns/integrations/params.rb
+++ b/app/controllers/concerns/integrations/params.rb
@ -102,4 +102,4 @@ module Integrations
  end
 end

-Integrations::Params.prepend_if_ee('EE::Integrations::Params')
+Integrations::Params.prepend_mod_with('Integrations::Params')
--- a/app/controllers/concerns/internal_redirect.rb
+++ b/app/controllers/concerns/internal_redirect.rb
@ -46,4 +46,4 @@ module InternalRedirect
  end
 end

-InternalRedirect.prepend_if_ee('EE::InternalRedirect')
+InternalRedirect.prepend_mod_with('InternalRedirect')
--- a/app/controllers/concerns/issuable_actions.rb
+++ b/app/controllers/concerns/issuable_actions.rb
@ -259,4 +259,4 @@ module IssuableActions
  # rubocop:enable Gitlab/ModuleWithInstanceVariables
 end

-IssuableActions.prepend_if_ee('EE::IssuableActions')
+IssuableActions.prepend_mod_with('IssuableActions')
--- a/app/controllers/concerns/issuable_collections.rb
+++ b/app/controllers/concerns/issuable_collections.rb
@ -158,4 +158,4 @@ module IssuableCollections
  # rubocop:enable Gitlab/ModuleWithInstanceVariables
 end

-IssuableCollections.prepend_if_ee('EE::IssuableCollections')
+IssuableCollections.prepend_mod_with('IssuableCollections')
--- a/app/controllers/concerns/lfs_request.rb
+++ b/app/controllers/concerns/lfs_request.rb
@ -136,4 +136,4 @@ module LfsRequest
  end
 end

-LfsRequest.prepend_if_ee('EE::LfsRequest')
+LfsRequest.prepend_mod_with('LfsRequest')
--- a/app/controllers/concerns/membership_actions.rb
+++ b/app/controllers/concerns/membership_actions.rb
@ -187,4 +187,4 @@ module MembershipActions
  end
 end

-MembershipActions.prepend_if_ee('EE::MembershipActions')
+MembershipActions.prepend_mod_with('MembershipActions')
--- a/app/controllers/concerns/routable_actions.rb
+++ b/app/controllers/concerns/routable_actions.rb
@ -56,4 +56,4 @@ module RoutableActions
  end
 end

-RoutableActions.prepend_if_ee('EE::RoutableActions')
+RoutableActions.prepend_mod_with('RoutableActions')
--- a/app/controllers/confirmations_controller.rb
+++ b/app/controllers/confirmations_controller.rb
@ -36,4 +36,4 @@ class ConfirmationsController < Devise::ConfirmationsController
  end
 end

-ConfirmationsController.prepend_if_ee('EE::ConfirmationsController')
+ConfirmationsController.prepend_mod_with('ConfirmationsController')
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@ -116,4 +116,4 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
  end
 end

-Dashboard::ProjectsController.prepend_if_ee('EE::Dashboard::ProjectsController')
+Dashboard::ProjectsController.prepend_mod_with('Dashboard::ProjectsController')
--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
@ -122,4 +122,4 @@ class Explore::ProjectsController < Explore::ApplicationController
  end
 end

-Explore::ProjectsController.prepend_if_ee('EE::Explore::ProjectsController')
+Explore::ProjectsController.prepend_mod_with('Explore::ProjectsController')
--- a/app/controllers/groups/application_controller.rb
+++ b/app/controllers/groups/application_controller.rb
@ -72,4 +72,4 @@ class Groups::ApplicationController < ApplicationController
  end
 end

-Groups::ApplicationController.prepend_if_ee('EE::Groups::ApplicationController')
+Groups::ApplicationController.prepend_mod_with('Groups::ApplicationController')
--- a/app/controllers/groups/autocomplete_sources_controller.rb
+++ b/app/controllers/groups/autocomplete_sources_controller.rb
@ -51,4 +51,4 @@ class Groups::AutocompleteSourcesController < Groups::ApplicationController
  # rubocop: enable CodeReuse/ActiveRecord
 end

-Groups::AutocompleteSourcesController.prepend_if_ee('EE::Groups::AutocompleteSourcesController')
+Groups::AutocompleteSourcesController.prepend_mod
--- a/app/controllers/groups/group_members_controller.rb
+++ b/app/controllers/groups/group_members_controller.rb
@ -89,4 +89,4 @@ class Groups::GroupMembersController < Groups::ApplicationController
  end
 end

-Groups::GroupMembersController.prepend_if_ee('EE::Groups::GroupMembersController')
+Groups::GroupMembersController.prepend_mod_with('Groups::GroupMembersController')
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@ -95,4 +95,4 @@ class Groups::MilestonesController < Groups::ApplicationController
  end
 end

-Groups::MilestonesController.prepend_if_ee('EE::Groups::MilestonesController')
+Groups::MilestonesController.prepend_mod_with('Groups::MilestonesController')
--- a/app/controllers/groups/settings/ci_cd_controller.rb
+++ b/app/controllers/groups/settings/ci_cd_controller.rb
@ -100,4 +100,4 @@ module Groups
  end
 end

-Groups::Settings::CiCdController.prepend_if_ee('EE::Groups::Settings::CiCdController')
+Groups::Settings::CiCdController.prepend_mod_with('Groups::Settings::CiCdController')
--- a/app/controllers/groups/variables_controller.rb
+++ b/app/controllers/groups/variables_controller.rb
@ -57,4 +57,4 @@ module Groups
  end
 end

-Groups::VariablesController.prepend_if_ee('EE::Groups::VariablesController')
+Groups::VariablesController.prepend_mod_with('Groups::VariablesController')
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@ -365,4 +365,4 @@ class GroupsController < Groups::ApplicationController
  end
 end

-GroupsController.prepend_if_ee('EE::GroupsController')
+GroupsController.prepend_mod_with('GroupsController')
--- a/app/controllers/import/github_controller.rb
+++ b/app/controllers/import/github_controller.rb
@ -265,4 +265,4 @@ class Import::GithubController < Import::BaseController
  end
 end

-Import::GithubController.prepend_if_ee('EE::Import::GithubController')
+Import::GithubController.prepend_mod_with('Import::GithubController')
--- a/app/controllers/ldap/omniauth_callbacks_controller.rb
+++ b/app/controllers/ldap/omniauth_callbacks_controller.rb
@ -38,4 +38,4 @@ class Ldap::OmniauthCallbacksController < OmniauthCallbacksController
  end
 end

-Ldap::OmniauthCallbacksController.prepend_if_ee('EE::Ldap::OmniauthCallbacksController')
+Ldap::OmniauthCallbacksController.prepend_mod_with('Ldap::OmniauthCallbacksController')
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@ -289,4 +289,4 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
  end
 end

-OmniauthCallbacksController.prepend_if_ee('EE::OmniauthCallbacksController')
+OmniauthCallbacksController.prepend_mod_with('OmniauthCallbacksController')
--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/passwords_controller.rb
@ -69,4 +69,4 @@ class PasswordsController < Devise::PasswordsController
  end
 end

-PasswordsController.prepend_if_ee('EE::PasswordsController')
+PasswordsController.prepend_mod_with('PasswordsController')
--- a/app/controllers/profiles/accounts_controller.rb
+++ b/app/controllers/profiles/accounts_controller.rb
@ -37,4 +37,4 @@ class Profiles::AccountsController < Profiles::ApplicationController
  end
 end

-Profiles::AccountsController.prepend_if_ee('EE::Profiles::AccountsController')
+Profiles::AccountsController.prepend_mod_with('Profiles::AccountsController')
--- a/app/controllers/profiles/personal_access_tokens_controller.rb
+++ b/app/controllers/profiles/personal_access_tokens_controller.rb
@ -60,4 +60,4 @@ class Profiles::PersonalAccessTokensController < Profiles::ApplicationController
  end
 end

-Profiles::PersonalAccessTokensController.prepend_if_ee('EE::Profiles::PersonalAccessTokensController')
+Profiles::PersonalAccessTokensController.prepend_mod_with('Profiles::PersonalAccessTokensController')
--- a/app/controllers/profiles/preferences_controller.rb
+++ b/app/controllers/profiles/preferences_controller.rb
@ -55,4 +55,4 @@ class Profiles::PreferencesController < Profiles::ApplicationController
  end
 end

-Profiles::PreferencesController.prepend_if_ee('::EE::Profiles::PreferencesController')
+Profiles::PreferencesController.prepend_mod_with('Profiles::PreferencesController')
--- a/app/controllers/projects/autocomplete_sources_controller.rb
+++ b/app/controllers/projects/autocomplete_sources_controller.rb
@ -49,4 +49,4 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController
  end
 end

-Projects::AutocompleteSourcesController.prepend_if_ee('EE::Projects::AutocompleteSourcesController')
+Projects::AutocompleteSourcesController.prepend_mod_with('Projects::AutocompleteSourcesController')
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@ -264,4 +264,4 @@ class Projects::EnvironmentsController < Projects::ApplicationController
  end
 end

-Projects::EnvironmentsController.prepend_if_ee('EE::Projects::EnvironmentsController')
+Projects::EnvironmentsController.prepend_mod_with('Projects::EnvironmentsController')
--- a/app/controllers/projects/forks_controller.rb
+++ b/app/controllers/projects/forks_controller.rb
@ -131,4 +131,4 @@ class Projects::ForksController < Projects::ApplicationController
  end
 end

-Projects::ForksController.prepend_if_ee('EE::Projects::ForksController')
+Projects::ForksController.prepend_mod_with('Projects::ForksController')
--- a/app/controllers/projects/group_links_controller.rb
+++ b/app/controllers/projects/group_links_controller.rb
@ -60,4 +60,4 @@ class Projects::GroupLinksController < Projects::ApplicationController
  end
 end

-Projects::GroupLinksController.prepend_if_ee('EE::Projects::GroupLinksController')
+Projects::GroupLinksController.prepend_mod_with('Projects::GroupLinksController')
--- a/app/controllers/projects/imports_controller.rb
+++ b/app/controllers/projects/imports_controller.rb
@ -81,4 +81,4 @@ class Projects::ImportsController < Projects::ApplicationController
  end
 end

-Projects::ImportsController.prepend_if_ee('EE::Projects::ImportsController')
+Projects::ImportsController.prepend_mod_with('Projects::ImportsController')
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@ -391,4 +391,4 @@ class Projects::IssuesController < Projects::ApplicationController
  def create_vulnerability_issue_feedback(issue); end
 end

-Projects::IssuesController.prepend_if_ee('EE::Projects::IssuesController')
+Projects::IssuesController.prepend_mod_with('Projects::IssuesController')
--- a/app/controllers/projects/merge_requests/application_controller.rb
+++ b/app/controllers/projects/merge_requests/application_controller.rb
@ -65,4 +65,4 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont
  end
 end

-Projects::MergeRequests::ApplicationController.prepend_if_ee('EE::Projects::MergeRequests::ApplicationController')
+Projects::MergeRequests::ApplicationController.prepend_mod_with('Projects::MergeRequests::ApplicationController')
--- a/app/controllers/projects/merge_requests/creations_controller.rb
+++ b/app/controllers/projects/merge_requests/creations_controller.rb
@ -141,4 +141,4 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap
  end
 end

-Projects::MergeRequests::CreationsController.prepend_ee_mod
+Projects::MergeRequests::CreationsController.prepend_mod
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@ -534,4 +534,4 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
  end
 end

-Projects::MergeRequestsController.prepend_if_ee('EE::Projects::MergeRequestsController')
+Projects::MergeRequestsController.prepend_mod_with('Projects::MergeRequestsController')
--- a/app/controllers/projects/mirrors_controller.rb
+++ b/app/controllers/projects/mirrors_controller.rb
@ -94,4 +94,4 @@ class Projects::MirrorsController < Projects::ApplicationController
  end
 end

-Projects::MirrorsController.prepend_if_ee('EE::Projects::MirrorsController')
+Projects::MirrorsController.prepend_mod_with('Projects::MirrorsController')
--- a/app/controllers/projects/pages_controller.rb
+++ b/app/controllers/projects/pages_controller.rb
@ -55,4 +55,4 @@ class Projects::PagesController < Projects::ApplicationController
  end
 end

-Projects::PagesController.prepend_if_ee('EE::Projects::PagesController')
+Projects::PagesController.prepend_mod_with('Projects::PagesController')
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@ -309,4 +309,4 @@ class Projects::PipelinesController < Projects::ApplicationController
  end
 end

-Projects::PipelinesController.prepend_if_ee('EE::Projects::PipelinesController')
+Projects::PipelinesController.prepend_mod_with('Projects::PipelinesController')
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@ -64,4 +64,4 @@ class Projects::ProjectMembersController < Projects::ApplicationController
  end
 end

-Projects::ProjectMembersController.prepend_if_ee('EE::Projects::ProjectMembersController')
+Projects::ProjectMembersController.prepend_mod_with('Projects::ProjectMembersController')
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@ -29,4 +29,4 @@ class Projects::ProtectedBranchesController < Projects::ProtectedRefsController
  end
 end

-Projects::ProtectedBranchesController.prepend_if_ee('EE::Projects::ProtectedBranchesController')
+Projects::ProtectedBranchesController.prepend_mod_with('Projects::ProtectedBranchesController')
--- a/app/controllers/projects/protected_refs_controller.rb
+++ b/app/controllers/projects/protected_refs_controller.rb
@ -68,4 +68,4 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
  end
 end

-Projects::ProtectedRefsController.prepend_if_ee('EE::Projects::ProtectedRefsController')
+Projects::ProtectedRefsController.prepend_mod_with('Projects::ProtectedRefsController')
--- a/app/controllers/projects/repositories_controller.rb
+++ b/app/controllers/projects/repositories_controller.rb
@ -127,4 +127,4 @@ class Projects::RepositoriesController < Projects::ApplicationController
  end
 end

-Projects::RepositoriesController.prepend_if_ee('EE::Projects::RepositoriesController')
+Projects::RepositoriesController.prepend_mod_with('Projects::RepositoriesController')
--- a/app/controllers/projects/security/configuration_controller.rb
+++ b/app/controllers/projects/security/configuration_controller.rb
@ -14,4 +14,4 @@ module Projects
  end
 end

-Projects::Security::ConfigurationController.prepend_if_ee('EE::Projects::Security::ConfigurationController')
+Projects::Security::ConfigurationController.prepend_mod_with('Projects::Security::ConfigurationController')
--- a/app/controllers/projects/settings/ci_cd_controller.rb
+++ b/app/controllers/projects/settings/ci_cd_controller.rb
@ -160,4 +160,4 @@ module Projects
  end
 end

-Projects::Settings::CiCdController.prepend_if_ee('EE::Projects::Settings::CiCdController')
+Projects::Settings::CiCdController.prepend_mod_with('Projects::Settings::CiCdController')
--- a/app/controllers/projects/settings/operations_controller.rb
+++ b/app/controllers/projects/settings/operations_controller.rb
@ -155,4 +155,4 @@ module Projects
  end
 end

-Projects::Settings::OperationsController.prepend_if_ee('::EE::Projects::Settings::OperationsController')
+Projects::Settings::OperationsController.prepend_mod_with('Projects::Settings::OperationsController')
--- a/app/controllers/projects/settings/repository_controller.rb
+++ b/app/controllers/projects/settings/repository_controller.rb
@ -134,4 +134,4 @@ module Projects
  end
 end

-Projects::Settings::RepositoryController.prepend_if_ee('EE::Projects::Settings::RepositoryController')
+Projects::Settings::RepositoryController.prepend_mod_with('Projects::Settings::RepositoryController')
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@ -545,4 +545,4 @@ class ProjectsController < Projects::ApplicationController
  end
 end

-ProjectsController.prepend_if_ee('EE::ProjectsController')
+ProjectsController.prepend_mod_with('ProjectsController')
--- a/app/controllers/registrations/welcome_controller.rb
+++ b/app/controllers/registrations/welcome_controller.rb
@ -70,4 +70,4 @@ module Registrations
  end
 end

-Registrations::WelcomeController.prepend_if_ee('EE::Registrations::WelcomeController')
+Registrations::WelcomeController.prepend_mod_with('Registrations::WelcomeController')
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@ -203,4 +203,4 @@ class RegistrationsController < Devise::RegistrationsController
  end
 end

-RegistrationsController.prepend_if_ee('EE::RegistrationsController')
+RegistrationsController.prepend_mod_with('RegistrationsController')
--- a/app/controllers/repositories/git_http_client_controller.rb
+++ b/app/controllers/repositories/git_http_client_controller.rb
@ -134,4 +134,4 @@ module Repositories
  end
 end

-Repositories::GitHttpClientController.prepend_if_ee('EE::Repositories::GitHttpClientController')
+Repositories::GitHttpClientController.prepend_mod_with('Repositories::GitHttpClientController')
--- a/app/controllers/repositories/git_http_controller.rb
+++ b/app/controllers/repositories/git_http_controller.rb
@ -122,4 +122,4 @@ module Repositories
  end
 end

-Repositories::GitHttpController.prepend_if_ee('EE::Repositories::GitHttpController')
+Repositories::GitHttpController.prepend_mod_with('Repositories::GitHttpController')
--- a/app/controllers/repositories/lfs_api_controller.rb
+++ b/app/controllers/repositories/lfs_api_controller.rb
@ -148,4 +148,4 @@ module Repositories
  end
 end

-Repositories::LfsApiController.prepend_if_ee('EE::Repositories::LfsApiController')
+Repositories::LfsApiController.prepend_mod_with('Repositories::LfsApiController')
--- a/app/controllers/root_controller.rb
+++ b/app/controllers/root_controller.rb
@ -70,4 +70,4 @@ class RootController < Dashboard::ProjectsController
  end
 end

-RootController.prepend_if_ee('EE::RootController')
+RootController.prepend_mod_with('RootController')
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@ -152,4 +152,4 @@ class SearchController < ApplicationController
  end
 end

-SearchController.prepend_if_ee('EE::SearchController')
+SearchController.prepend_mod_with('SearchController')
--- a/app/controllers/sent_notifications_controller.rb
+++ b/app/controllers/sent_notifications_controller.rb
@ -53,4 +53,4 @@ class SentNotificationsController < ApplicationController
  end
 end

-SentNotificationsController.prepend_if_ee('EE::SentNotificationsController')
+SentNotificationsController.prepend_mod_with('SentNotificationsController')
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@ -315,4 +315,4 @@ class SessionsController < Devise::SessionsController
  end
 end

-SessionsController.prepend_if_ee('EE::SessionsController')
+SessionsController.prepend_mod_with('SessionsController')
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@ -117,4 +117,4 @@ class UploadsController < ApplicationController
  end
 end

-UploadsController.prepend_if_ee('EE::UploadsController')
+UploadsController.prepend_mod_with('UploadsController')
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -260,4 +260,4 @@ class UsersController < ApplicationController
  end
 end

-UsersController.prepend_if_ee('EE::UsersController')
+UsersController.prepend_mod_with('UsersController')
--- a/app/finders/alert_management/alerts_finder.rb
+++ b/app/finders/alert_management/alerts_finder.rb
@ -67,4 +67,4 @@ module AlertManagement
  end
 end

-AlertManagement::AlertsFinder.prepend_if_ee('EE::AlertManagement::AlertsFinder')
+AlertManagement::AlertsFinder.prepend_mod_with('AlertManagement::AlertsFinder')
--- a/app/finders/alert_management/http_integrations_finder.rb
+++ b/app/finders/alert_management/http_integrations_finder.rb
@ -51,4 +51,4 @@ module AlertManagement
  end
 end

-::AlertManagement::HttpIntegrationsFinder.prepend_if_ee('EE::AlertManagement::HttpIntegrationsFinder')
+::AlertManagement::HttpIntegrationsFinder.prepend_mod_with('AlertManagement::HttpIntegrationsFinder')
--- a/app/finders/autocomplete/users_finder.rb
+++ b/app/finders/autocomplete/users_finder.rb
@ -102,4 +102,4 @@ module Autocomplete
  end
 end

-Autocomplete::UsersFinder.prepend_if_ee('EE::Autocomplete::UsersFinder')
+Autocomplete::UsersFinder.prepend_mod_with('Autocomplete::UsersFinder')
--- a/app/finders/ci/daily_build_group_report_results_finder.rb
+++ b/app/finders/ci/daily_build_group_report_results_finder.rb
@ -94,4 +94,4 @@ module Ci
  end
 end

-Ci::DailyBuildGroupReportResultsFinder.prepend_if_ee('::EE::Ci::DailyBuildGroupReportResultsFinder')
+Ci::DailyBuildGroupReportResultsFinder.prepend_mod_with('Ci::DailyBuildGroupReportResultsFinder')
--- a/app/finders/fork_targets_finder.rb
+++ b/app/finders/fork_targets_finder.rb
@ -19,4 +19,4 @@ class ForkTargetsFinder
  attr_reader :project, :user
 end

-ForkTargetsFinder.prepend_if_ee('EE::ForkTargetsFinder')
+ForkTargetsFinder.prepend_mod_with('ForkTargetsFinder')
--- a/app/finders/group_members_finder.rb
+++ b/app/finders/group_members_finder.rb
@ -88,4 +88,4 @@ class GroupMembersFinder < UnionFinder
  end
 end

-GroupMembersFinder.prepend_if_ee('EE::GroupMembersFinder')
+GroupMembersFinder.prepend_mod_with('GroupMembersFinder')
--- a/app/finders/group_projects_finder.rb
+++ b/app/finders/group_projects_finder.rb
@ -126,4 +126,4 @@ class GroupProjectsFinder < ProjectsFinder
  end
 end

-GroupProjectsFinder.prepend_if_ee('EE::GroupProjectsFinder')
+GroupProjectsFinder.prepend_mod_with('GroupProjectsFinder')
--- a/app/finders/issues_finder.rb
+++ b/app/finders/issues_finder.rb
@ -117,4 +117,4 @@ class IssuesFinder < IssuableFinder
  end
 end

-IssuesFinder.prepend_if_ee('EE::IssuesFinder')
+IssuesFinder.prepend_mod_with('IssuesFinder')
--- a/app/finders/issues_finder/params.rb
+++ b/app/finders/issues_finder/params.rb
@ -45,4 +45,4 @@ class IssuesFinder
  end
 end

-IssuesFinder::Params.prepend_if_ee('EE::IssuesFinder::Params')
+IssuesFinder::Params.prepend_mod_with('IssuesFinder::Params')
--- a/app/finders/license_template_finder.rb
+++ b/app/finders/license_template_finder.rb
@ -56,4 +56,4 @@ class LicenseTemplateFinder
  end
 end

-LicenseTemplateFinder.prepend_if_ee('::EE::LicenseTemplateFinder')
+LicenseTemplateFinder.prepend_mod_with('LicenseTemplateFinder')
--- a/app/finders/merge_requests_finder.rb
+++ b/app/finders/merge_requests_finder.rb
@ -220,4 +220,4 @@ class MergeRequestsFinder < IssuableFinder
  end
 end

-MergeRequestsFinder.prepend_if_ee('EE::MergeRequestsFinder')
+MergeRequestsFinder.prepend_mod_with('MergeRequestsFinder')
--- a/app/finders/namespaces/projects_finder.rb
+++ b/app/finders/namespaces/projects_finder.rb
@ -60,4 +60,4 @@ module Namespaces
  end
 end

-Namespaces::ProjectsFinder.prepend_if_ee('::EE::Namespaces::ProjectsFinder')
+Namespaces::ProjectsFinder.prepend_mod_with('Namespaces::ProjectsFinder')
--- a/app/finders/notes_finder.rb
+++ b/app/finders/notes_finder.rb
@ -183,4 +183,4 @@ class NotesFinder
  end
 end

-NotesFinder.prepend_if_ee('EE::NotesFinder')
+NotesFinder.prepend_mod_with('NotesFinder')
--- a/app/finders/projects_finder.rb
+++ b/app/finders/projects_finder.rb
@ -247,4 +247,4 @@ class ProjectsFinder < UnionFinder
  end
 end

-ProjectsFinder.prepend_if_ee('::EE::ProjectsFinder')
+ProjectsFinder.prepend_mod_with('ProjectsFinder')
--- a/app/finders/snippets_finder.rb
+++ b/app/finders/snippets_finder.rb
@ -221,4 +221,4 @@ class SnippetsFinder < UnionFinder
  end
 end

-SnippetsFinder.prepend_if_ee('EE::SnippetsFinder')
+SnippetsFinder.prepend_mod_with('SnippetsFinder')
--- a/app/finders/template_finder.rb
+++ b/app/finders/template_finder.rb
@ -70,4 +70,4 @@ class TemplateFinder
  end
 end

-TemplateFinder.prepend_if_ee('::EE::TemplateFinder')
+TemplateFinder.prepend_mod_with('TemplateFinder')
--- a/app/finders/todos_finder.rb
+++ b/app/finders/todos_finder.rb
@ -215,4 +215,4 @@ class TodosFinder
  end
 end

-TodosFinder.prepend_if_ee('EE::TodosFinder')
+TodosFinder.prepend_mod_with('TodosFinder')
--- a/app/finders/users_finder.rb
+++ b/app/finders/users_finder.rb
@ -143,4 +143,4 @@ class UsersFinder
  # rubocop: enable CodeReuse/ActiveRecord
 end

-UsersFinder.prepend_if_ee('EE::UsersFinder')
+UsersFinder.prepend_mod_with('UsersFinder')
--- a/app/graphql/gitlab_schema.rb
+++ b/app/graphql/gitlab_schema.rb
@ -170,7 +170,7 @@ class GitlabSchema < GraphQL::Schema
  end
 end

-GitlabSchema.prepend_if_ee('EE::GitlabSchema') # rubocop: disable Cop/InjectEnterpriseEditionModule
+GitlabSchema.prepend_mod_with('GitlabSchema') # rubocop: disable Cop/InjectEnterpriseEditionModule

 # Force the schema to load as a workaround for intermittent errors we
 # see due to a lack of thread safety.
--- a/app/graphql/mutations/alert_management/http_integration/create.rb
+++ b/app/graphql/mutations/alert_management/http_integration/create.rb
@ -34,4 +34,4 @@ module Mutations
  end
 end

-Mutations::AlertManagement::HttpIntegration::Create.prepend_if_ee('::EE::Mutations::AlertManagement::HttpIntegration::Create')
+Mutations::AlertManagement::HttpIntegration::Create.prepend_mod_with('Mutations::AlertManagement::HttpIntegration::Create')
--- a/app/graphql/mutations/alert_management/http_integration/http_integration_base.rb
+++ b/app/graphql/mutations/alert_management/http_integration/http_integration_base.rb
@ -33,4 +33,4 @@ module Mutations
  end
 end

-Mutations::AlertManagement::HttpIntegration::HttpIntegrationBase.prepend_if_ee('::EE::Mutations::AlertManagement::HttpIntegration::HttpIntegrationBase')
+Mutations::AlertManagement::HttpIntegration::HttpIntegrationBase.prepend_mod_with('Mutations::AlertManagement::HttpIntegration::HttpIntegrationBase')
--- a/Show More
+++ b/Show More