diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-16 00:10:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-16 00:10:20 +0300 |
commit | be522a9abd386ad605786eeb805e12025af0c742 (patch) | |
tree | 3f1057f84c7594b42a889281f96fd51fb778e894 /app | |
parent | 0e5ce539275e32cfd7592362e03673807fca9cc7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
6 files changed, 32 insertions, 4 deletions
diff --git a/app/assets/javascripts/invite_members/components/import_project_members_modal.vue b/app/assets/javascripts/invite_members/components/import_project_members_modal.vue index e58e274253a..cc95027f0db 100644 --- a/app/assets/javascripts/invite_members/components/import_project_members_modal.vue +++ b/app/assets/javascripts/invite_members/components/import_project_members_modal.vue @@ -4,12 +4,20 @@ import { uniqueId, isEmpty } from 'lodash'; import { importProjectMembers } from '~/api/projects_api'; import { BV_SHOW_MODAL, BV_HIDE_MODAL } from '~/lib/utils/constants'; import { s__, __, sprintf } from '~/locale'; +import Tracking from '~/tracking'; import eventHub from '../event_hub'; + import { displaySuccessfulInvitationAlert, reloadOnInvitationSuccess, } from '../utils/trigger_successful_invite_alert'; -import { PROJECT_SELECT_LABEL_ID } from '../constants'; + +import { + PROJECT_SELECT_LABEL_ID, + IMPORT_PROJECT_MEMBERS_MODAL_TRACKING_CATEGORY, + IMPORT_PROJECT_MEMBERS_MODAL_TRACKING_LABEL, +} from '../constants'; + import UserLimitNotification from './user_limit_notification.vue'; import ProjectSelect from './project_select.vue'; @@ -22,6 +30,12 @@ export default { UserLimitNotification, ProjectSelect, }, + mixins: [ + Tracking.mixin({ + category: IMPORT_PROJECT_MEMBERS_MODAL_TRACKING_CATEGORY, + label: IMPORT_PROJECT_MEMBERS_MODAL_TRACKING_LABEL, + }), + ], props: { projectId: { type: String, @@ -92,6 +106,7 @@ export default { }, methods: { openModal() { + this.track('render'); this.$root.$emit(BV_SHOW_MODAL, this.$options.modalId); }, closeModal() { @@ -115,6 +130,8 @@ export default { }); }, onInviteSuccess() { + this.track('invite_successful'); + if (this.reloadPageOnSubmit) { reloadOnInvitationSuccess(); } else { @@ -128,6 +145,12 @@ export default { showErrorAlert() { this.invalidFeedbackMessage = this.$options.i18n.defaultError; }, + onCancel() { + this.track('click_cancel'); + }, + onClose() { + this.track('click_x'); + }, }, toastOptions() { return { @@ -166,6 +189,8 @@ export default { no-focus-on-show @primary="submitImport" @hidden="resetFields" + @cancel="onCancel" + @close="onClose" > <user-limit-notification v-if="showUserLimitNotification" diff --git a/app/assets/javascripts/invite_members/constants.js b/app/assets/javascripts/invite_members/constants.js index 9afcaff6e16..a4fe1a413aa 100644 --- a/app/assets/javascripts/invite_members/constants.js +++ b/app/assets/javascripts/invite_members/constants.js @@ -25,6 +25,8 @@ export const TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI = 'dropdown-text-emoji'; export const TRIGGER_ELEMENT_DISCLOSURE_DROPDOWN = 'dropdown-text'; export const INVITE_MEMBER_MODAL_TRACKING_CATEGORY = 'invite_members_modal'; export const TRIGGER_DEFAULT_QA_SELECTOR = 'invite_members_button'; +export const IMPORT_PROJECT_MEMBERS_MODAL_TRACKING_CATEGORY = 'invite_project_members_modal'; +export const IMPORT_PROJECT_MEMBERS_MODAL_TRACKING_LABEL = 'project-members-page'; export const MEMBERS_MODAL_DEFAULT_TITLE = s__('InviteMembersModal|Invite members'); export const MEMBERS_MODAL_CELEBRATE_TITLE = s__( 'InviteMembersModal|GitLab is better with colleagues!', diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 6cb95d665cc..a71b47e88d8 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -628,6 +628,7 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord validates :search_rate_limit validates :search_rate_limit_unauthenticated validates :projects_api_rate_limit_unauthenticated + validates :gitlab_shell_operation_limit end validates :notes_create_limit_allowlist, diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb index c73bdf8793c..81e816a5b7c 100644 --- a/app/models/application_setting_implementation.rb +++ b/app/models/application_setting_implementation.rb @@ -259,7 +259,8 @@ module ApplicationSettingImplementation projects_api_rate_limit_unauthenticated: 400, gitlab_dedicated_instance: false, ci_max_includes: 150, - allow_account_deletion: true + allow_account_deletion: true, + gitlab_shell_operation_limit: 600 }.tap do |hsh| hsh.merge!(non_production_defaults) unless Rails.env.production? end diff --git a/app/models/integration.rb b/app/models/integration.rb index bd24f73c882..f2f242136ab 100644 --- a/app/models/integration.rb +++ b/app/models/integration.rb @@ -81,6 +81,7 @@ class Integration < ApplicationRecord attribute :commit_events, default: true attribute :confidential_issues_events, default: true attribute :confidential_note_events, default: true + attribute :deployment_events, default: false attribute :issues_events, default: true attribute :job_events, default: true attribute :merge_requests_events, default: true diff --git a/app/workers/ci/update_locked_unknown_artifacts_worker.rb b/app/workers/ci/update_locked_unknown_artifacts_worker.rb index 2d37ebb3c93..c796b7a28a8 100644 --- a/app/workers/ci/update_locked_unknown_artifacts_worker.rb +++ b/app/workers/ci/update_locked_unknown_artifacts_worker.rb @@ -15,8 +15,6 @@ module Ci feature_category :build_artifacts def perform - return unless ::Feature.enabled?(:ci_job_artifacts_backlog_work) - artifact_counts = Ci::JobArtifacts::UpdateUnknownLockedStatusService.new.execute log_extra_metadata_on_done(:removed_count, artifact_counts[:removed]) |