diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
commit | 41fe97390ceddf945f3d967b8fdb3de4c66b7dea (patch) | |
tree | 9c8d89a8624828992f06d892cd2f43818ff5dcc8 /app/assets/javascripts/deploy_tokens | |
parent | 0804d2dc31052fb45a1efecedc8e06ce9bc32862 (diff) |
Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/deploy_tokens')
-rw-r--r-- | app/assets/javascripts/deploy_tokens/components/revoke_button.vue | 6 | ||||
-rw-r--r-- | app/assets/javascripts/deploy_tokens/init_revoke_button.js | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/app/assets/javascripts/deploy_tokens/components/revoke_button.vue b/app/assets/javascripts/deploy_tokens/components/revoke_button.vue index fdf8b7796bf..7879357a042 100644 --- a/app/assets/javascripts/deploy_tokens/components/revoke_button.vue +++ b/app/assets/javascripts/deploy_tokens/components/revoke_button.vue @@ -17,9 +17,6 @@ export default { revokePath: { default: '', }, - buttonClass: { - default: '', - }, }, computed: { modalId() { @@ -38,10 +35,9 @@ export default { <div> <gl-button v-gl-modal="modalId" - :class="buttonClass" category="primary" variant="danger" - class="float-right" + class="gl-float-right" data-testid="revoke-button" >{{ s__('DeployTokens|Revoke') }}</gl-button > diff --git a/app/assets/javascripts/deploy_tokens/init_revoke_button.js b/app/assets/javascripts/deploy_tokens/init_revoke_button.js index 20187150a60..bc3f3c9ddf4 100644 --- a/app/assets/javascripts/deploy_tokens/init_revoke_button.js +++ b/app/assets/javascripts/deploy_tokens/init_revoke_button.js @@ -9,14 +9,13 @@ export default () => { } return containers.forEach((el) => { - const { token, revokePath, buttonClass } = el.dataset; + const { token, revokePath } = el.dataset; return new Vue({ el, provide: { token: JSON.parse(token), revokePath, - buttonClass, }, render(h) { return h(RevokeButton); |