Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2021-05-11 21:10:21 +00:00
parent f020d5dc9b
commit 0ae8428c8e
838 changed files with 1124 additions and 1125 deletions

View file

@ -1 +1 @@
4a1b0d4018ee35cfe786ba3dd975b20013a39e39
8d525bfb986a26ee6c1c6d0ec976fa2614928cf8

View file

@ -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>

View file

@ -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';

View file

@ -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"

View file

@ -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';

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -556,4 +556,4 @@ class ApplicationController < ActionController::Base
end
end
ApplicationController.prepend_ee_mod
ApplicationController.prepend_mod

View file

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

View file

@ -158,4 +158,4 @@ module Boards
end
end
Boards::IssuesController.prepend_if_ee('EE::Boards::IssuesController')
Boards::IssuesController.prepend_mod_with('Boards::IssuesController')

View file

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

View file

@ -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')

View file

@ -177,4 +177,4 @@ module AuthenticatesWithTwoFactor
end
end
AuthenticatesWithTwoFactor.prepend_if_ee('EE::AuthenticatesWithTwoFactor')
AuthenticatesWithTwoFactor.prepend_mod_with('AuthenticatesWithTwoFactor')

View file

@ -65,4 +65,4 @@ module BoardsActions
end
end
BoardsActions.prepend_if_ee('EE::BoardsActions')
BoardsActions.prepend_mod_with('BoardsActions')

View file

@ -91,4 +91,4 @@ module BoardsResponses
end
end
BoardsResponses.prepend_if_ee('EE::BoardsResponses')
BoardsResponses.prepend_mod_with('BoardsResponses')

View file

@ -43,4 +43,4 @@ module CycleAnalyticsParams
end
end
CycleAnalyticsParams.prepend_if_ee('EE::CycleAnalyticsParams')
CycleAnalyticsParams.prepend_mod_with('CycleAnalyticsParams')

View file

@ -72,4 +72,4 @@ module EnforcesTwoFactorAuthentication
end
end
EnforcesTwoFactorAuthentication.prepend_if_ee('EE::EnforcesTwoFactorAuthentication')
EnforcesTwoFactorAuthentication.prepend_mod_with('EnforcesTwoFactorAuthentication')

View file

@ -102,4 +102,4 @@ module Integrations
end
end
Integrations::Params.prepend_if_ee('EE::Integrations::Params')
Integrations::Params.prepend_mod_with('Integrations::Params')

View file

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

View file

@ -259,4 +259,4 @@ module IssuableActions
# rubocop:enable Gitlab/ModuleWithInstanceVariables
end
IssuableActions.prepend_if_ee('EE::IssuableActions')
IssuableActions.prepend_mod_with('IssuableActions')

View file

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

View file

@ -136,4 +136,4 @@ module LfsRequest
end
end
LfsRequest.prepend_if_ee('EE::LfsRequest')
LfsRequest.prepend_mod_with('LfsRequest')

View file

@ -187,4 +187,4 @@ module MembershipActions
end
end
MembershipActions.prepend_if_ee('EE::MembershipActions')
MembershipActions.prepend_mod_with('MembershipActions')

View file

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

View file

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

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -57,4 +57,4 @@ module Groups
end
end
Groups::VariablesController.prepend_if_ee('EE::Groups::VariablesController')
Groups::VariablesController.prepend_mod_with('Groups::VariablesController')

View file

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

View file

@ -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')

View file

@ -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')

View file

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

View file

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

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -141,4 +141,4 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap
end
end
Projects::MergeRequests::CreationsController.prepend_ee_mod
Projects::MergeRequests::CreationsController.prepend_mod

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

@ -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')

View file

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

View file

@ -70,4 +70,4 @@ module Registrations
end
end
Registrations::WelcomeController.prepend_if_ee('EE::Registrations::WelcomeController')
Registrations::WelcomeController.prepend_mod_with('Registrations::WelcomeController')

View file

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

View file

@ -134,4 +134,4 @@ module Repositories
end
end
Repositories::GitHttpClientController.prepend_if_ee('EE::Repositories::GitHttpClientController')
Repositories::GitHttpClientController.prepend_mod_with('Repositories::GitHttpClientController')

View file

@ -122,4 +122,4 @@ module Repositories
end
end
Repositories::GitHttpController.prepend_if_ee('EE::Repositories::GitHttpController')
Repositories::GitHttpController.prepend_mod_with('Repositories::GitHttpController')

View file

@ -148,4 +148,4 @@ module Repositories
end
end
Repositories::LfsApiController.prepend_if_ee('EE::Repositories::LfsApiController')
Repositories::LfsApiController.prepend_mod_with('Repositories::LfsApiController')

View file

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

View file

@ -152,4 +152,4 @@ class SearchController < ApplicationController
end
end
SearchController.prepend_if_ee('EE::SearchController')
SearchController.prepend_mod_with('SearchController')

View file

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

View file

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

View file

@ -117,4 +117,4 @@ class UploadsController < ApplicationController
end
end
UploadsController.prepend_if_ee('EE::UploadsController')
UploadsController.prepend_mod_with('UploadsController')

View file

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

View file

@ -67,4 +67,4 @@ module AlertManagement
end
end
AlertManagement::AlertsFinder.prepend_if_ee('EE::AlertManagement::AlertsFinder')
AlertManagement::AlertsFinder.prepend_mod_with('AlertManagement::AlertsFinder')

View file

@ -51,4 +51,4 @@ module AlertManagement
end
end
::AlertManagement::HttpIntegrationsFinder.prepend_if_ee('EE::AlertManagement::HttpIntegrationsFinder')
::AlertManagement::HttpIntegrationsFinder.prepend_mod_with('AlertManagement::HttpIntegrationsFinder')

View file

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

View file

@ -94,4 +94,4 @@ module Ci
end
end
Ci::DailyBuildGroupReportResultsFinder.prepend_if_ee('::EE::Ci::DailyBuildGroupReportResultsFinder')
Ci::DailyBuildGroupReportResultsFinder.prepend_mod_with('Ci::DailyBuildGroupReportResultsFinder')

View file

@ -19,4 +19,4 @@ class ForkTargetsFinder
attr_reader :project, :user
end
ForkTargetsFinder.prepend_if_ee('EE::ForkTargetsFinder')
ForkTargetsFinder.prepend_mod_with('ForkTargetsFinder')

View file

@ -88,4 +88,4 @@ class GroupMembersFinder < UnionFinder
end
end
GroupMembersFinder.prepend_if_ee('EE::GroupMembersFinder')
GroupMembersFinder.prepend_mod_with('GroupMembersFinder')

View file

@ -126,4 +126,4 @@ class GroupProjectsFinder < ProjectsFinder
end
end
GroupProjectsFinder.prepend_if_ee('EE::GroupProjectsFinder')
GroupProjectsFinder.prepend_mod_with('GroupProjectsFinder')

View file

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

View file

@ -45,4 +45,4 @@ class IssuesFinder
end
end
IssuesFinder::Params.prepend_if_ee('EE::IssuesFinder::Params')
IssuesFinder::Params.prepend_mod_with('IssuesFinder::Params')

View file

@ -56,4 +56,4 @@ class LicenseTemplateFinder
end
end
LicenseTemplateFinder.prepend_if_ee('::EE::LicenseTemplateFinder')
LicenseTemplateFinder.prepend_mod_with('LicenseTemplateFinder')

View file

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

View file

@ -60,4 +60,4 @@ module Namespaces
end
end
Namespaces::ProjectsFinder.prepend_if_ee('::EE::Namespaces::ProjectsFinder')
Namespaces::ProjectsFinder.prepend_mod_with('Namespaces::ProjectsFinder')

View file

@ -183,4 +183,4 @@ class NotesFinder
end
end
NotesFinder.prepend_if_ee('EE::NotesFinder')
NotesFinder.prepend_mod_with('NotesFinder')

View file

@ -247,4 +247,4 @@ class ProjectsFinder < UnionFinder
end
end
ProjectsFinder.prepend_if_ee('::EE::ProjectsFinder')
ProjectsFinder.prepend_mod_with('ProjectsFinder')

View file

@ -221,4 +221,4 @@ class SnippetsFinder < UnionFinder
end
end
SnippetsFinder.prepend_if_ee('EE::SnippetsFinder')
SnippetsFinder.prepend_mod_with('SnippetsFinder')

View file

@ -70,4 +70,4 @@ class TemplateFinder
end
end
TemplateFinder.prepend_if_ee('::EE::TemplateFinder')
TemplateFinder.prepend_mod_with('TemplateFinder')

View file

@ -215,4 +215,4 @@ class TodosFinder
end
end
TodosFinder.prepend_if_ee('EE::TodosFinder')
TodosFinder.prepend_mod_with('TodosFinder')

View file

@ -143,4 +143,4 @@ class UsersFinder
# rubocop: enable CodeReuse/ActiveRecord
end
UsersFinder.prepend_if_ee('EE::UsersFinder')
UsersFinder.prepend_mod_with('UsersFinder')

View file

@ -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.

View file

@ -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')

View file

@ -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')

Some files were not shown because too many files have changed in this diff Show more