diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-02 15:14:26 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-02 15:14:26 +0300 |
commit | ce459835cb32ed396fb7524fb615a5d07f8c51ef (patch) | |
tree | bc56e024828f25d53f8b713b4d8f6393b8755112 /app/assets/javascripts/invite_members | |
parent | 374f3dee7dc0fae10a34daf503b8bf3078008f4b (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/invite_members_modal.vue | 7 |
1 files changed, 6 insertions, 1 deletions
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 607c888b85a..812e39e6392 100644 --- a/app/assets/javascripts/invite_members/components/invite_members_modal.vue +++ b/app/assets/javascripts/invite_members/components/invite_members_modal.vue @@ -51,6 +51,8 @@ export default { MembersTokenSelect, ModalConfetti, UserLimitNotification, + ActiveTrialNotification: () => + import('ee_component/invite_members/components/active_trial_notification.vue'), }, mixins: [Tracking.mixin({ category: INVITE_MEMBER_MODAL_TRACKING_CATEGORY })], inject: ['newProjectPath'], @@ -421,7 +423,6 @@ export default { :new-users-to-invite="newUsersToInvite" :root-group-id="rootId" :users-limit-dataset="usersLimitDataset" - :active-trial-dataset="activeTrialDataset" :full-path="fullPath" @close="onClose" @cancel="onCancel" @@ -504,6 +505,10 @@ export default { </div> </template> + <template #active-trial-alert> + <active-trial-notification v-if="!isCelebration" :active-trial-dataset="activeTrialDataset" /> + </template> + <template #select="{ exceptionState, inputId }"> <members-token-select v-model="newUsersToInvite" |