From 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 18 Feb 2021 10:34:06 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-9-stable-ee --- .../invite_members/components/invite_members_modal.vue | 9 +++++---- .../invite_members/components/members_token_select.vue | 4 ++-- .../javascripts/invite_members/init_invite_members_modal.js | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'app/assets/javascripts/invite_members') diff --git a/app/assets/javascripts/invite_members/components/invite_members_modal.vue b/app/assets/javascripts/invite_members/components/invite_members_modal.vue index a92289ca8c1..f5a65882fba 100644 --- a/app/assets/javascripts/invite_members/components/invite_members_modal.vue +++ b/app/assets/javascripts/invite_members/components/invite_members_modal.vue @@ -10,10 +10,11 @@ import { GlFormInput, } from '@gitlab/ui'; import { partition, isString } from 'lodash'; -import eventHub from '../event_hub'; -import { s__, __, sprintf } from '~/locale'; import Api from '~/api'; import MembersTokenSelect from '~/invite_members/components/members_token_select.vue'; +import { BV_SHOW_MODAL, BV_HIDE_MODAL } from '~/lib/utils/constants'; +import { s__, __, sprintf } from '~/locale'; +import eventHub from '../event_hub'; export default { name: 'InviteMembersModal', @@ -113,10 +114,10 @@ export default { ]; }, openModal() { - this.$root.$emit('bv::show::modal', this.modalId); + this.$root.$emit(BV_SHOW_MODAL, this.modalId); }, closeModal() { - this.$root.$emit('bv::hide::modal', this.modalId); + this.$root.$emit(BV_HIDE_MODAL, this.modalId); }, sendInvite() { this.submitForm(); diff --git a/app/assets/javascripts/invite_members/components/members_token_select.vue b/app/assets/javascripts/invite_members/components/members_token_select.vue index 627d4ab2771..233a214013b 100644 --- a/app/assets/javascripts/invite_members/components/members_token_select.vue +++ b/app/assets/javascripts/invite_members/components/members_token_select.vue @@ -1,9 +1,9 @@