Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 6 deletions

diff --git a/app/assets/javascripts/prometheus_alerts/components/reset_key.vue b/app/assets/javascripts/prometheus_alerts/components/reset_key.vue
index 3a03cd409a6..15b6a29e5cf 100644
--- a/app/assets/javascripts/prometheus_alerts/components/reset_key.vue
+++ b/app/assets/javascripts/prometheus_alerts/components/reset_key.vue
@@ -1,5 +1,11 @@
 <script>
-import { GlButton, GlFormGroup, GlFormInput, GlModal, GlModalDirective } from '@gitlab/ui';
+import {
+  GlDeprecatedButton,
+  GlFormGroup,
+  GlFormInput,
+  GlModal,
+  GlModalDirective,
+} from '@gitlab/ui';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import axios from '~/lib/utils/axios_utils';
 import { __, sprintf } from '~/locale';
@@ -8,7 +14,7 @@ import createFlash from '~/flash';
 export default {
   copyToClipboard: __('Copy'),
   components: {
-    GlButton,
+    GlDeprecatedButton,
     GlFormGroup,
     GlFormInput,
     GlModal,
@@ -112,13 +118,13 @@ export default {
             )
           }}
         </gl-modal>
-        <gl-button v-gl-modal.authKeyModal class="js-reset-auth-key">{{
+        <gl-deprecated-button v-gl-modal.authKeyModal class="js-reset-auth-key">{{
           __('Reset key')
-        }}</gl-button>
+        }}</gl-deprecated-button>
       </template>
-      <gl-button v-else class="js-reset-auth-key" @click="resetKey">{{
+      <gl-deprecated-button v-else class="js-reset-auth-key" @click="resetKey">{{
         __('Generate key')
-      }}</gl-button>
+      }}</gl-deprecated-button>
     </div>
   </div>
 </template>