Add latest changes from gitlab-org/gitlab@master

3 files changed, 22 insertions, 22 deletions

diff --git a/app/assets/javascripts/error_tracking/components/error_details.vue b/app/assets/javascripts/error_tracking/components/error_details.vue
index 6c4f59eb49f..a8103c80da0 100644
--- a/app/assets/javascripts/error_tracking/components/error_details.vue
+++ b/app/assets/javascripts/error_tracking/components/error_details.vue
@@ -3,7 +3,7 @@ import { mapActions, mapGetters, mapState } from 'vuex';
 import dateFormat from 'dateformat';
 import createFlash from '~/flash';
 import {
-  GlButton,
+  GlDeprecatedButton,
   GlFormInput,
   GlLink,
   GlLoadingIcon,
@@ -29,7 +29,7 @@ const SENTRY_TIMEOUT = 10000;
 
 export default {
   components: {
-    GlButton,
+    GlDeprecatedButton,
     GlFormInput,
     GlLink,
     GlLoadingIcon,
@@ -257,22 +257,22 @@ export default {
         </div>
         <div class="error-details-actions">
           <div class="d-inline-flex bv-d-sm-down-none">
-            <gl-button
+            <gl-deprecated-button
               :loading="updatingIgnoreStatus"
               data-qa-selector="update_ignore_status_button"
               @click="onIgnoreStatusUpdate"
             >
               {{ ignoreBtnLabel }}
-            </gl-button>
-            <gl-button
+            </gl-deprecated-button>
+            <gl-deprecated-button
               class="btn-outline-info ml-2"
               :loading="updatingResolveStatus"
               data-qa-selector="update_resolve_status_button"
               @click="onResolveStatusUpdate"
             >
               {{ resolveBtnLabel }}
-            </gl-button>
-            <gl-button
+            </gl-deprecated-button>
+            <gl-deprecated-button
               v-if="error.gitlabIssuePath"
               class="ml-2"
               data-qa-selector="view_issue_button"
@@ -280,7 +280,7 @@ export default {
               variant="success"
             >
               {{ __('View issue') }}
-            </gl-button>
+            </gl-deprecated-button>
             <form
               ref="sentryIssueForm"
               :action="projectIssuesPath"
@@ -295,7 +295,7 @@ export default {
                 name="issue[sentry_issue_attributes][sentry_issue_identifier]"
               />
               <gl-form-input :value="csrfToken" class="hidden" name="authenticity_token" />
-              <gl-button
+              <gl-deprecated-button
                 v-if="!error.gitlabIssuePath"
                 class="btn-success"
                 :loading="issueCreationInProgress"
@@ -303,7 +303,7 @@ export default {
                 @click="createIssue"
               >
                 {{ __('Create issue') }}
-              </gl-button>
+              </gl-deprecated-button>
             </form>
           </div>
           <gl-dropdown
diff --git a/app/assets/javascripts/error_tracking/components/error_tracking_actions.vue b/app/assets/javascripts/error_tracking/components/error_tracking_actions.vue
index 49eb04e331b..0e3fd70b17b 100644
--- a/app/assets/javascripts/error_tracking/components/error_tracking_actions.vue
+++ b/app/assets/javascripts/error_tracking/components/error_tracking_actions.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlButton, GlIcon, GlButtonGroup, GlTooltipDirective } from '@gitlab/ui';
+import { GlDeprecatedButton, GlIcon, GlButtonGroup, GlTooltipDirective } from '@gitlab/ui';
 import { __ } from '~/locale';
 
 const IGNORED = 'ignored';
@@ -10,7 +10,7 @@ const statusValidation = [IGNORED, RESOLVED, UNRESOLVED];
 
 export default {
   components: {
-    GlButton,
+    GlDeprecatedButton,
     GlIcon,
     GlButtonGroup,
   },
@@ -45,7 +45,7 @@ export default {
 <template>
   <div>
     <gl-button-group class="flex-column flex-md-row ml-0 ml-md-n4">
-      <gl-button
+      <gl-deprecated-button
         :key="ignoreBtn.status"
         :ref="`${ignoreBtn.title.toLowerCase()}Error`"
         v-gl-tooltip.hover
@@ -55,8 +55,8 @@ export default {
       >
         <gl-icon class="d-none d-md-inline m-0" :name="ignoreBtn.icon" :size="12" />
         <span class="d-md-none">{{ ignoreBtn.title }}</span>
-      </gl-button>
-      <gl-button
+      </gl-deprecated-button>
+      <gl-deprecated-button
         :key="resolveBtn.status"
         :ref="`${resolveBtn.title.toLowerCase()}Error`"
         v-gl-tooltip.hover
@@ -66,15 +66,15 @@ export default {
       >
         <gl-icon class="d-none d-md-inline m-0" :name="resolveBtn.icon" :size="12" />
         <span class="d-md-none">{{ resolveBtn.title }}</span>
-      </gl-button>
+      </gl-deprecated-button>
     </gl-button-group>
-    <gl-button
+    <gl-deprecated-button
       :href="detailsLink"
       category="secondary"
       variant="info"
       class="d-block d-md-none mb-2 mb-md-0"
     >
       {{ __('More details') }}
-    </gl-button>
+    </gl-deprecated-button>
   </div>
 </template>
diff --git a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue
index ea0baaf4569..3d700f4d216 100644
--- a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue
+++ b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue
@@ -2,7 +2,7 @@
 import { mapActions, mapState } from 'vuex';
 import {
   GlEmptyState,
-  GlButton,
+  GlDeprecatedButton,
   GlIcon,
   GlLink,
   GlLoadingIcon,
@@ -69,7 +69,7 @@ export default {
   },
   components: {
     GlEmptyState,
-    GlButton,
+    GlDeprecatedButton,
     GlDropdown,
     GlDropdownItem,
     GlDropdownDivider,
@@ -250,7 +250,7 @@ export default {
               />
             </div>
             <div class="gl-search-box-by-type-right-icons">
-              <gl-button
+              <gl-deprecated-button
                 v-if="errorSearchQuery.length > 0"
                 v-gl-tooltip.hover
                 :title="__('Clear')"
@@ -259,7 +259,7 @@ export default {
                 @click="errorSearchQuery = ''"
               >
                 <gl-icon name="close" :size="12" />
-              </gl-button>
+              </gl-deprecated-button>
             </div>
           </div>
         </div>