Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 16 deletions

diff --git a/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue b/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue
index e4bc00fc102..95eb427a49c 100644
--- a/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue
+++ b/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue
@@ -7,7 +7,7 @@ import {
   GlSprintf,
   GlLink,
   GlToggle,
-  GlButton,
+  GlDeprecatedButton,
   GlDropdown,
   GlDropdownItem,
   GlIcon,
@@ -25,7 +25,7 @@ export default {
     GlSprintf,
     GlLink,
     GlToggle,
-    GlButton,
+    GlDeprecatedButton,
     GlDropdown,
     GlDropdownItem,
     GlIcon,
@@ -235,17 +235,17 @@ export default {
             </div>
           </div>
           <div v-if="showButtons" class="mt-3">
-            <gl-button
+            <gl-deprecated-button
               class="btn-success inline mr-1"
               :loading="saving"
               :disabled="saveButtonDisabled"
               @click="updateApplication"
             >
               {{ saveButtonLabel }}
-            </gl-button>
-            <gl-button :disabled="saveButtonDisabled" @click="resetStatus">
+            </gl-deprecated-button>
+            <gl-deprecated-button :disabled="saveButtonDisabled" @click="resetStatus">
               {{ __('Cancel') }}
-            </gl-button>
+            </gl-deprecated-button>
           </div>
         </div>
       </div>
diff --git a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue
index bdbaf2ed558..b35adae3352 100644
--- a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue
+++ b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue
@@ -1,7 +1,7 @@
 <script>
 import { escape as esc } from 'lodash';
 import SplitButton from '~/vue_shared/components/split_button.vue';
-import { GlModal, GlButton, GlFormInput } from '@gitlab/ui';
+import { GlModal, GlDeprecatedButton, GlFormInput } from '@gitlab/ui';
 import { s__, sprintf } from '~/locale';
 import csrf from '~/lib/utils/csrf';
 
@@ -27,7 +27,7 @@ export default {
   components: {
     SplitButton,
     GlModal,
-    GlButton,
+    GlDeprecatedButton,
     GlFormInput,
   },
   props: {
@@ -148,19 +148,24 @@ export default {
         }}</span>
       </template>
       <template slot="modal-footer">
-        <gl-button variant="secondary" @click="handleCancel">{{ s__('Cancel') }}</gl-button>
+        <gl-deprecated-button variant="secondary" @click="handleCancel">{{
+          s__('Cancel')
+        }}</gl-deprecated-button>
         <template v-if="confirmCleanup">
-          <gl-button :disabled="!canSubmit" variant="warning" @click="handleSubmit">{{
+          <gl-deprecated-button :disabled="!canSubmit" variant="warning" @click="handleSubmit">{{
             s__('ClusterIntegration|Remove integration')
-          }}</gl-button>
-          <gl-button :disabled="!canSubmit" variant="danger" @click="handleSubmit(true)">{{
-            s__('ClusterIntegration|Remove integration and resources')
-          }}</gl-button>
+          }}</gl-deprecated-button>
+          <gl-deprecated-button
+            :disabled="!canSubmit"
+            variant="danger"
+            @click="handleSubmit(true)"
+            >{{ s__('ClusterIntegration|Remove integration and resources') }}</gl-deprecated-button
+          >
         </template>
         <template v-else>
-          <gl-button :disabled="!canSubmit" variant="danger" @click="handleSubmit">{{
+          <gl-deprecated-button :disabled="!canSubmit" variant="danger" @click="handleSubmit">{{
             s__('ClusterIntegration|Remove integration')
-          }}</gl-button>
+          }}</gl-deprecated-button>
         </template>
       </template>
     </gl-modal>