Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-09 15:15:13 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-09 15:15:13 +0300
commit0b4adad74b76b34855e9a6d943f9b9188c3914fa (patch)
tree1084ffd8336bc8e9af6f7042a093bf78e0852ac3 /app/assets/javascripts/invite_members
parentece36a21699c2a218b8bd14b22bea47d22218354 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/invite_members')
-rw-r--r--app/assets/javascripts/invite_members/components/import_project_members_modal.vue1
-rw-r--r--app/assets/javascripts/invite_members/components/invite_modal_base.vue1
2 files changed, 2 insertions, 0 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 ffd3a2caa7f..10c08d63612 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
@@ -150,6 +150,7 @@ export default {
:title="$options.i18n.modalTitle"
:action-primary="actionPrimary"
:action-cancel="actionCancel"
+ no-focus-on-show
@primary="submitImport"
@hidden="resetFields"
>
diff --git a/app/assets/javascripts/invite_members/components/invite_modal_base.vue b/app/assets/javascripts/invite_members/components/invite_modal_base.vue
index 20dc32b3c9b..91b623821dd 100644
--- a/app/assets/javascripts/invite_members/components/invite_modal_base.vue
+++ b/app/assets/javascripts/invite_members/components/invite_modal_base.vue
@@ -259,6 +259,7 @@ export default {
dialog-class="gl-mx-5"
:title="modalTitle"
:header-close-label="$options.HEADER_CLOSE_LABEL"
+ no-focus-on-show
@shown="onShowModal"
@close="onClose"
@hidden="onReset"