diff options
Diffstat (limited to 'app/assets/javascripts/pages/projects/forks/new/components')
-rw-r--r-- | app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list.vue | 7 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list_item.vue | 27 |
2 files changed, 7 insertions, 27 deletions
diff --git a/app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list.vue b/app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list.vue index a614443bcd9..bc47b124f8b 100644 --- a/app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list.vue +++ b/app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list.vue @@ -1,8 +1,8 @@ <script> import { GlTabs, GlTab, GlLoadingIcon, GlSearchBoxByType } from '@gitlab/ui'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import ForkGroupsListItem from './fork_groups_list_item.vue'; export default { @@ -14,10 +14,6 @@ export default { ForkGroupsListItem, }, props: { - hasReachedProjectLimit: { - type: Boolean, - required: true, - }, endpoint: { type: String, required: true, @@ -77,7 +73,6 @@ export default { v-for="(namespace, index) in filteredNamespaces" :key="index" :group="namespace" - :has-reached-project-limit="hasReachedProjectLimit" /> </ul> </gl-tab> diff --git a/app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list_item.vue b/app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list_item.vue index 57838050d55..46d1696b88b 100644 --- a/app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list_item.vue +++ b/app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list_item.vue @@ -10,7 +10,6 @@ import { GlSafeHtmlDirective as SafeHtml, } from '@gitlab/ui'; import { VISIBILITY_TYPE_ICON, GROUP_VISIBILITY_TYPE } from '~/groups/constants'; -import { __ } from '~/locale'; import csrf from '~/lib/utils/csrf'; export default { @@ -31,10 +30,6 @@ export default { type: Object, required: true, }, - hasReachedProjectLimit: { - type: Boolean, - required: true, - }, }, data() { return { namespaces: null, isForking: false }; @@ -60,12 +55,7 @@ export default { return GROUP_VISIBILITY_TYPE[this.group.visibility]; }, isSelectButtonDisabled() { - return this.hasReachedProjectLimit || !this.group.can_create_project; - }, - selectButtonDisabledTooltip() { - return this.hasReachedProjectLimit - ? this.$options.i18n.hasReachedProjectLimitMessage - : this.$options.i18n.insufficientPermissionsMessage; + return !this.group.can_create_project; }, }, @@ -76,13 +66,6 @@ export default { }, }, - i18n: { - hasReachedProjectLimitMessage: __('You have reached your project limit'), - insufficientPermissionsMessage: __( - 'You must have permission to create a project in a namespace before forking.', - ), - }, - csrf, }; </script> @@ -94,7 +77,7 @@ export default { </div> <gl-link :href="group.relative_path" - class="gl-display-none gl-flex-shrink-0 gl-display-sm-flex gl-mr-3" + class="gl-display-none gl-flex-shrink-0 gl-sm-display-flex gl-mr-3" > <gl-avatar :size="32" shape="rect" :entity-name="group.name" :src="group.avatarUrl" /> </gl-link> @@ -113,7 +96,7 @@ export default { <gl-badge v-if="isGroupPendingRemoval" variant="warning" - class="gl-display-none gl-display-sm-flex gl-mt-3 gl-mr-1" + class="gl-display-none gl-sm-display-flex gl-mt-3 gl-mr-1" >{{ __('pending removal') }}</gl-badge > <span v-if="group.permission" class="user-access-role gl-mt-3"> @@ -149,7 +132,9 @@ export default { </form> </div> <gl-tooltip v-if="isSelectButtonDisabled" :target="() => $refs.selectButtonWrapper"> - {{ selectButtonDisabledTooltip }} + {{ + __('You must have permission to create a project in a namespace before forking.') + }} </gl-tooltip> </template> </div> |