diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-01 09:09:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-01 09:09:59 +0300 |
| commit | a7e81add72ecfbbf888ec4f73debdc2647b059de (patch) | |
| tree | 3139b36451667bdd07181ef35044bd9903424fb1 /app/assets/javascripts/clusters | |
| parent | 4ed4dc08a806773e5dc326fc0c18bda6f6ea7af7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/clusters')
| -rw-r--r-- | app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue b/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue index 5e8e1a76182..ec252878e93 100644 --- a/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue +++ b/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue @@ -5,7 +5,7 @@ import { GlSprintf, GlLink, GlToggle, - GlDeprecatedButton, + GlButton, GlDeprecatedDropdown, GlDeprecatedDropdownItem, GlIcon, @@ -25,7 +25,7 @@ export default { GlSprintf, GlLink, GlToggle, - GlDeprecatedButton, + GlButton, GlDeprecatedDropdown, GlDeprecatedDropdownItem, GlIcon, @@ -232,18 +232,24 @@ export default { </gl-deprecated-dropdown> </div> </div> - <div v-if="showButtons" class="mt-3"> - <gl-deprecated-button - class="btn-success inline mr-1" + <div v-if="showButtons" class="gl-mt-5 gl-display-flex"> + <gl-button + variant="success" + category="primary" + data-qa-selector="save_ingress_modsecurity_settings" :loading="saving" :disabled="saveButtonDisabled" @click="updateApplication" > {{ saveButtonLabel }} - </gl-deprecated-button> - <gl-deprecated-button :disabled="saveButtonDisabled" @click="resetStatus"> + </gl-button> + <gl-button + data-qa-selector="cancel_ingress_modsecurity_settings" + :disabled="saveButtonDisabled" + @click="resetStatus" + > {{ __('Cancel') }} - </gl-deprecated-button> + </gl-button> </div> </div> </div> |