diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-14 21:08:55 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-14 21:08:55 +0300 |
commit | 3828d19ab2d68dd6cafa6f08221e1eee572671e7 (patch) | |
tree | afd36fcf20499d876493bf24bd9f0ee926454547 /app/assets/javascripts/invite_members | |
parent | 3e764061b3209d4deee2a55851d5d564a9f19d8b (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_trigger.vue | 17 | ||||
-rw-r--r-- | app/assets/javascripts/invite_members/constants.js | 1 |
2 files changed, 2 insertions, 16 deletions
diff --git a/app/assets/javascripts/invite_members/components/invite_members_trigger.vue b/app/assets/javascripts/invite_members/components/invite_members_trigger.vue index 91a52c36e41..6d1a3ceba16 100644 --- a/app/assets/javascripts/invite_members/components/invite_members_trigger.vue +++ b/app/assets/javascripts/invite_members/components/invite_members_trigger.vue @@ -1,17 +1,16 @@ <script> -import { GlButton, GlLink, GlIcon, GlDropdownItem } from '@gitlab/ui'; +import { GlButton, GlLink, GlDropdownItem } from '@gitlab/ui'; import { s__ } from '~/locale'; import eventHub from '../event_hub'; import { TRIGGER_ELEMENT_BUTTON, - TRIGGER_ELEMENT_SIDE_NAV, TRIGGER_DEFAULT_QA_SELECTOR, TRIGGER_ELEMENT_WITH_EMOJI, TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI, } from '../constants'; export default { - components: { GlButton, GlLink, GlIcon, GlDropdownItem }, + components: { GlButton, GlLink, GlDropdownItem }, props: { displayText: { type: String, @@ -66,7 +65,6 @@ export default { }, }, TRIGGER_ELEMENT_BUTTON, - TRIGGER_ELEMENT_SIDE_NAV, TRIGGER_ELEMENT_WITH_EMOJI, TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI, }; @@ -83,17 +81,6 @@ export default { {{ displayText }} </gl-button> <gl-link - v-else-if="checkTrigger($options.TRIGGER_ELEMENT_SIDE_NAV)" - v-bind="componentAttributes" - data-is-link="true" - @click="openModal" - > - <span class="nav-icon-container"> - <gl-icon :name="icon" /> - </span> - <span class="nav-item-name"> {{ displayText }} </span> - </gl-link> - <gl-link v-else-if="checkTrigger($options.TRIGGER_ELEMENT_WITH_EMOJI)" v-bind="componentAttributes" @click="openModal" diff --git a/app/assets/javascripts/invite_members/constants.js b/app/assets/javascripts/invite_members/constants.js index 34b4e436392..86badd16d6c 100644 --- a/app/assets/javascripts/invite_members/constants.js +++ b/app/assets/javascripts/invite_members/constants.js @@ -19,7 +19,6 @@ export const GROUP_FILTERS = { export const USERS_FILTER_ALL = 'all'; export const USERS_FILTER_SAML_PROVIDER_ID = 'saml_provider_id'; export const TRIGGER_ELEMENT_BUTTON = 'button'; -export const TRIGGER_ELEMENT_SIDE_NAV = 'side-nav'; export const TOP_NAV_INVITE_MEMBERS_COMPONENT = 'invite_members'; export const TRIGGER_ELEMENT_WITH_EMOJI = 'text-emoji'; export const TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI = 'dropdown-text-emoji'; |