diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 96af281acd6..fb0a396446b 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -69984aee4bae5d28182946aba78737e0acbc635c +1c364e717ce8fdc4a6603f7369756785c146c898 diff --git a/app/assets/javascripts/ci_settings_pipeline_triggers/components/triggers_list.vue b/app/assets/javascripts/ci_settings_pipeline_triggers/components/triggers_list.vue index 4ab9b36058d..4156717908d 100644 --- a/app/assets/javascripts/ci_settings_pipeline_triggers/components/triggers_list.vue +++ b/app/assets/javascripts/ci_settings_pipeline_triggers/components/triggers_list.vue @@ -8,8 +8,12 @@ import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link export default { i18n: { + copyTrigger: s__('Pipelines|Copy trigger token'), editButton: s__('Pipelines|Edit'), - revokeButton: s__('Pipelines|Revoke'), + revokeButton: s__('Pipelines|Revoke trigger'), + revokeButtonConfirm: s__( + 'Pipelines|By revoking a trigger you will break any processes making use of it. Are you sure?', + ), }, components: { GlTable, @@ -72,7 +76,7 @@ export default { :text="item.token" data-testid="clipboard-btn" data-qa-selector="clipboard_button" - :title="s__('Pipelines|Copy trigger token')" + :title="$options.i18n.copyTrigger" css-class="gl-border-none gl-py-0 gl-px-2" />
@@ -122,13 +126,9 @@ export default { :title="$options.i18n.revokeButton" :aria-label="$options.i18n.revokeButton" icon="remove" - variant="warning" - :data-confirm=" - s__( - 'Pipelines|By revoking a trigger you will break any processes making use of it. Are you sure?', - ) - " + :data-confirm="$options.i18n.revokeButtonConfirm" data-method="delete" + data-confirm-btn-variant="danger" rel="nofollow" class="gl-ml-3" data-testid="trigger_revoke_button" diff --git a/app/assets/javascripts/emoji/components/picker.vue b/app/assets/javascripts/emoji/components/picker.vue index 686b5ffff9e..840297b870a 100644 --- a/app/assets/javascripts/emoji/components/picker.vue +++ b/app/assets/javascripts/emoji/components/picker.vue @@ -108,6 +108,7 @@ export default { class="gl-mx-5! gl-mb-2!" autofocus debounce="500" + :aria-label="__('Search for an emoji')" @input="onSearchInput" />