Commit 0565889d authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch 'arfedoro-pipeline-settings-triggers-list' into 'master'

Added missing button variant to remove triggers from list

See merge request gitlab-org/gitlab!81135
parents f6f186f2 49f7330f
...@@ -8,8 +8,12 @@ import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link ...@@ -8,8 +8,12 @@ import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link
export default { export default {
i18n: { i18n: {
copyTrigger: s__('Pipelines|Copy trigger token'),
editButton: s__('Pipelines|Edit'), 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: { components: {
GlTable, GlTable,
...@@ -72,7 +76,7 @@ export default { ...@@ -72,7 +76,7 @@ export default {
:text="item.token" :text="item.token"
data-testid="clipboard-btn" data-testid="clipboard-btn"
data-qa-selector="clipboard_button" 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" css-class="gl-border-none gl-py-0 gl-px-2"
/> />
<div class="label-container"> <div class="label-container">
...@@ -122,13 +126,9 @@ export default { ...@@ -122,13 +126,9 @@ export default {
:title="$options.i18n.revokeButton" :title="$options.i18n.revokeButton"
:aria-label="$options.i18n.revokeButton" :aria-label="$options.i18n.revokeButton"
icon="remove" icon="remove"
variant="warning" :data-confirm="$options.i18n.revokeButtonConfirm"
:data-confirm="
s__(
'Pipelines|By revoking a trigger you will break any processes making use of it. Are you sure?',
)
"
data-method="delete" data-method="delete"
data-confirm-btn-variant="danger"
rel="nofollow" rel="nofollow"
class="gl-ml-3" class="gl-ml-3"
data-testid="trigger_revoke_button" data-testid="trigger_revoke_button"
......
...@@ -26948,7 +26948,7 @@ msgstr "" ...@@ -26948,7 +26948,7 @@ msgstr ""
msgid "Pipelines|Project cache successfully reset." msgid "Pipelines|Project cache successfully reset."
msgstr "" msgstr ""
msgid "Pipelines|Revoke" msgid "Pipelines|Revoke trigger"
msgstr "" msgstr ""
msgid "Pipelines|Something went wrong while cleaning runners cache." msgid "Pipelines|Something went wrong while cleaning runners cache."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment