diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 12:09:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 12:09:31 +0300 |
commit | 04baa85554ff13bdd4d6f4e6bb24119d17608fee (patch) | |
tree | 7cb9c0977e09d97da340f48703d79b2dbd3579a0 /app/assets/javascripts/registry | |
parent | 42f41de46525ce0065f02ee07c1a79f5669526a0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/registry')
3 files changed, 16 insertions, 16 deletions
diff --git a/app/assets/javascripts/registry/explorer/pages/details.vue b/app/assets/javascripts/registry/explorer/pages/details.vue index b558ed51a5b..6afd4d1107a 100644 --- a/app/assets/javascripts/registry/explorer/pages/details.vue +++ b/app/assets/javascripts/registry/explorer/pages/details.vue @@ -3,7 +3,7 @@ import { mapState, mapActions, mapGetters } from 'vuex'; import { GlTable, GlFormCheckbox, - GlButton, + GlDeprecatedButton, GlIcon, GlTooltipDirective, GlPagination, @@ -41,7 +41,7 @@ export default { components: { GlTable, GlFormCheckbox, - GlButton, + GlDeprecatedButton, GlIcon, ClipboardButton, GlPagination, @@ -250,7 +250,7 @@ export default { /> </template> <template #head(actions)> - <gl-button + <gl-deprecated-button ref="bulkDeleteButton" v-gl-tooltip :disabled="!selectedItems || selectedItems.length === 0" @@ -261,7 +261,7 @@ export default { @click="deleteMultipleItems()" > <gl-icon name="remove" /> - </gl-button> + </gl-deprecated-button> </template> <template #cell(checkbox)="{index}"> @@ -304,7 +304,7 @@ export default { </span> </template> <template #cell(actions)="{index, item}"> - <gl-button + <gl-deprecated-button ref="singleDeleteButton" :title="s__('ContainerRegistry|Remove tag')" :aria-label="s__('ContainerRegistry|Remove tag')" @@ -314,7 +314,7 @@ export default { @click="deleteSingleItem(index)" > <gl-icon name="remove" /> - </gl-button> + </gl-deprecated-button> </template> <template #empty> diff --git a/app/assets/javascripts/registry/explorer/pages/list.vue b/app/assets/javascripts/registry/explorer/pages/list.vue index 1ed24fbb59f..7204cbd90eb 100644 --- a/app/assets/javascripts/registry/explorer/pages/list.vue +++ b/app/assets/javascripts/registry/explorer/pages/list.vue @@ -4,7 +4,7 @@ import { GlEmptyState, GlPagination, GlTooltipDirective, - GlButton, + GlDeprecatedButton, GlIcon, GlModal, GlSprintf, @@ -30,7 +30,7 @@ export default { ProjectPolicyAlert, ClipboardButton, QuickstartDropdown, - GlButton, + GlDeprecatedButton, GlIcon, GlModal, GlSprintf, @@ -201,7 +201,7 @@ export default { class="d-none d-sm-block" :title="$options.i18n.deleteButtonDisabled" > - <gl-button + <gl-deprecated-button ref="deleteImageButton" v-gl-tooltip :disabled="!listItem.destroy_path" @@ -212,7 +212,7 @@ export default { @click="deleteImage(listItem)" > <gl-icon name="remove" /> - </gl-button> + </gl-deprecated-button> </div> </div> <gl-pagination diff --git a/app/assets/javascripts/registry/settings/components/settings_form.vue b/app/assets/javascripts/registry/settings/components/settings_form.vue index cab3c7fff85..afd502109bf 100644 --- a/app/assets/javascripts/registry/settings/components/settings_form.vue +++ b/app/assets/javascripts/registry/settings/components/settings_form.vue @@ -1,6 +1,6 @@ <script> import { mapActions, mapState, mapGetters } from 'vuex'; -import { GlCard, GlButton, GlLoadingIcon } from '@gitlab/ui'; +import { GlCard, GlDeprecatedButton, GlLoadingIcon } from '@gitlab/ui'; import Tracking from '~/tracking'; import { UPDATE_SETTINGS_ERROR_MESSAGE, @@ -12,7 +12,7 @@ import ExpirationPolicyFields from '../../shared/components/expiration_policy_fi export default { components: { GlCard, - GlButton, + GlDeprecatedButton, GlLoadingIcon, ExpirationPolicyFields, }, @@ -73,15 +73,15 @@ export default { </template> <template #footer> <div class="d-flex justify-content-end"> - <gl-button + <gl-deprecated-button ref="cancel-button" type="reset" class="mr-2 d-block" :disabled="isCancelButtonDisabled" > {{ __('Cancel') }} - </gl-button> - <gl-button + </gl-deprecated-button> + <gl-deprecated-button ref="save-button" type="submit" :disabled="isSubmitButtonDisabled" @@ -90,7 +90,7 @@ export default { > {{ __('Save expiration policy') }} <gl-loading-icon v-if="isLoading" class="ml-2" /> - </gl-button> + </gl-deprecated-button> </div> </template> </gl-card> |