Add latest changes from gitlab-org/gitlab@master

6 files changed, 30 insertions, 30 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue
index 45798fbc9dc..996e54a1183 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue
@@ -1,12 +1,12 @@
 <script>
-import { GlTooltipDirective, GlButton } from '@gitlab/ui';
+import { GlTooltipDirective, GlDeprecatedButton } from '@gitlab/ui';
 import { __ } from '~/locale';
 import { RUNNING } from './constants';
 
 export default {
   name: 'DeploymentActionButton',
   components: {
-    GlButton,
+    GlDeprecatedButton,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -59,7 +59,7 @@ export default {
 
 <template>
   <span v-gl-tooltip :title="actionInProgressTooltip" class="d-inline-block" tabindex="0">
-    <gl-button
+    <gl-deprecated-button
       v-gl-tooltip
       :title="buttonTitle"
       :loading="isLoading"
@@ -70,6 +70,6 @@ export default {
       <span class="d-inline-flex align-items-baseline">
         <slot> </slot>
       </span>
-    </gl-button>
+    </gl-deprecated-button>
   </span>
 </template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue
index 96603d23374..ba8da46d207 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue
@@ -1,11 +1,11 @@
 <script>
-import { GlButton, GlLoadingIcon } from '@gitlab/ui';
+import { GlDeprecatedButton, GlLoadingIcon } from '@gitlab/ui';
 import { __ } from '~/locale';
 import Icon from '~/vue_shared/components/icon.vue';
 
 export default {
   components: {
-    GlButton,
+    GlDeprecatedButton,
     GlLoadingIcon,
     Icon,
   },
@@ -58,7 +58,7 @@ export default {
       </div>
 
       <template v-else>
-        <gl-button
+        <gl-deprecated-button
           class="btn-blank btn s32 square append-right-default"
           :aria-label="ariaLabel"
           :disabled="isLoading"
@@ -66,8 +66,8 @@ export default {
         >
           <gl-loading-icon v-if="isLoading" />
           <icon v-else :name="arrowIconName" class="js-icon" />
-        </gl-button>
-        <gl-button
+        </gl-deprecated-button>
+        <gl-deprecated-button
           variant="link"
           class="js-title"
           :disabled="isLoading"
@@ -76,7 +76,7 @@ export default {
         >
           <template v-if="isCollapsed">{{ title }}</template>
           <template v-else>{{ __('Collapse') }}</template>
-        </gl-button>
+        </gl-deprecated-button>
       </template>
     </div>
 
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue
index 266c07ead25..dcf02a29f52 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlButton } from '@gitlab/ui';
+import { GlDeprecatedButton } from '@gitlab/ui';
 import { escape as esc } from 'lodash';
 import { __, n__, sprintf, s__ } from '~/locale';
 import Icon from '~/vue_shared/components/icon.vue';
@@ -7,7 +7,7 @@ import Icon from '~/vue_shared/components/icon.vue';
 export default {
   components: {
     Icon,
-    GlButton,
+    GlDeprecatedButton,
   },
   props: {
     isSquashEnabled: {
@@ -80,20 +80,20 @@ export default {
       class="js-mr-widget-commits-count mr-widget-extension clickable d-flex align-items-center px-3 py-2"
       @click="toggle()"
     >
-      <gl-button
+      <gl-deprecated-button
         :aria-label="ariaLabel"
         variant="blank"
         class="commit-edit-toggle square s24 append-right-default"
         @click.stop="toggle()"
       >
         <icon :name="collapseIcon" :size="16" />
-      </gl-button>
+      </gl-deprecated-button>
       <span v-if="expanded">{{ __('Collapse') }}</span>
       <span v-else>
         <span class="vertical-align-middle" v-html="message"></span>
-        <gl-button variant="link" class="modify-message-button">
+        <gl-deprecated-button variant="link" class="modify-message-button">
           {{ modifyLinkMessage }}
-        </gl-button>
+        </gl-deprecated-button>
       </span>
     </div>
     <div v-show="expanded"><slot></slot></div>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_tour.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_tour.vue
index f2d7e86a85e..01a195049ba 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_tour.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_tour.vue
@@ -1,6 +1,6 @@
 <script>
 import { s__, sprintf } from '~/locale';
-import { GlPopover, GlButton } from '@gitlab/ui';
+import { GlPopover, GlDeprecatedButton } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';
 import Cookies from 'js-cookie';
 import { parseBoolean } from '~/lib/utils/common_utils';
@@ -29,7 +29,7 @@ export default {
   ),
   components: {
     GlPopover,
-    GlButton,
+    GlDeprecatedButton,
     Icon,
   },
   mixins: [trackingMixin],
@@ -111,7 +111,7 @@ export default {
       <img :src="pipelineSvgPath" />
     </div>
     <p v-html="$options.popoverContent"></p>
-    <gl-button
+    <gl-deprecated-button
       ref="ok"
       category="primary"
       class="mt-2 mb-0"
@@ -124,8 +124,8 @@ export default {
       :data-track-label="trackLabel"
     >
       {{ __('Show me how') }}
-    </gl-button>
-    <gl-button
+    </gl-deprecated-button>
+    <gl-deprecated-button
       ref="no-thanks"
       category="secondary"
       class="mt-2 mb-0"
@@ -138,6 +138,6 @@ export default {
       @click="dismissPopover"
     >
       {{ __("No thanks, don't show this again") }}
-    </gl-button>
+    </gl-deprecated-button>
   </gl-popover>
 </template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
index e34060c3393..360a75c3946 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
@@ -1,6 +1,6 @@
 <script>
 import { isEmpty } from 'lodash';
-import { GlIcon, GlButton } from '@gitlab/ui';
+import { GlIcon, GlDeprecatedButton } from '@gitlab/ui';
 import successSvg from 'icons/_icon_status_success.svg';
 import warningSvg from 'icons/_icon_status_warning.svg';
 import readyToMergeMixin from 'ee_else_ce/vue_merge_request_widget/mixins/ready_to_merge';
@@ -26,7 +26,7 @@ export default {
     CommitEdit,
     CommitMessageDropdown,
     GlIcon,
-    GlButton,
+    GlDeprecatedButton,
     MergeImmediatelyConfirmationDialog: () =>
       import(
         'ee_component/vue_merge_request_widget/components/merge_immediately_confirmation_dialog.vue'
@@ -263,7 +263,7 @@ export default {
       <div class="media-body">
         <div class="mr-widget-body-controls media space-children">
           <span class="btn-group">
-            <gl-button
+            <gl-deprecated-button
               size="sm"
               class="qa-merge-button accept-merge-request"
               :variant="mergeButtonVariant"
@@ -272,7 +272,7 @@ export default {
               @click="handleMergeButtonClick(isAutoMergeAvailable)"
             >
               {{ mergeButtonText }}
-            </gl-button>
+            </gl-deprecated-button>
             <button
               v-if="shouldShowMergeImmediatelyDropdown"
               :disabled="isMergeButtonDisabled"
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
index e52ad9156d5..118caac84b9 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
@@ -1,6 +1,6 @@
 <script>
 import $ from 'jquery';
-import { GlButton } from '@gitlab/ui';
+import { GlDeprecatedButton } from '@gitlab/ui';
 import { __, s__ } from '~/locale';
 import createFlash from '~/flash';
 import StatusIcon from '../mr_widget_status_icon.vue';
@@ -11,7 +11,7 @@ export default {
   name: 'WorkInProgress',
   components: {
     StatusIcon,
-    GlButton,
+    GlDeprecatedButton,
   },
   directives: {
     tooltip,
@@ -66,7 +66,7 @@ export default {
         >
         </i>
       </span>
-      <gl-button
+      <gl-deprecated-button
         v-if="mr.removeWIPPath"
         size="sm"
         variant="default"
@@ -76,7 +76,7 @@ export default {
         @click="handleRemoveWIP"
       >
         {{ s__('mrWidget|Resolve WIP status') }}
-      </gl-button>
+      </gl-deprecated-button>
     </div>
   </div>
 </template>