Add latest changes from gitlab-org/gitlab@master

4 files changed, 22 insertions, 19 deletions

diff --git a/app/assets/javascripts/jobs/components/job_log_controllers.vue b/app/assets/javascripts/jobs/components/job_log_controllers.vue
index 156735441ca..bcec83a7aee 100644
--- a/app/assets/javascripts/jobs/components/job_log_controllers.vue
+++ b/app/assets/javascripts/jobs/components/job_log_controllers.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlTooltipDirective, GlLink, GlButton } from '@gitlab/ui';
+import { GlTooltipDirective, GlLink, GlDeprecatedButton } from '@gitlab/ui';
 import { polyfillSticky } from '~/lib/utils/sticky';
 import Icon from '~/vue_shared/components/icon.vue';
 import { numberToHumanSize } from '~/lib/utils/number_utils';
@@ -10,7 +10,7 @@ export default {
   components: {
     Icon,
     GlLink,
-    GlButton,
+    GlDeprecatedButton,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -111,18 +111,18 @@ export default {
 
       <!-- scroll buttons -->
       <div v-gl-tooltip :title="s__('Job|Scroll to top')" class="controllers-buttons">
-        <gl-button
+        <gl-deprecated-button
           :disabled="isScrollTopDisabled"
           type="button"
           class="js-scroll-top btn-scroll btn-transparent btn-blank"
           @click="handleScrollToTop"
         >
           <icon name="scroll_up" />
-        </gl-button>
+        </gl-deprecated-button>
       </div>
 
       <div v-gl-tooltip :title="s__('Job|Scroll to bottom')" class="controllers-buttons">
-        <gl-button
+        <gl-deprecated-button
           :disabled="isScrollBottomDisabled"
           class="js-scroll-bottom btn-scroll btn-transparent btn-blank"
           :class="{ animate: isScrollingDown }"
diff --git a/app/assets/javascripts/jobs/components/manual_variables_form.vue b/app/assets/javascripts/jobs/components/manual_variables_form.vue
index a23f30d571a..d4aab5c7faf 100644
--- a/app/assets/javascripts/jobs/components/manual_variables_form.vue
+++ b/app/assets/javascripts/jobs/components/manual_variables_form.vue
@@ -1,14 +1,14 @@
 <script>
 import { uniqueId } from 'lodash';
 import { mapActions } from 'vuex';
-import { GlButton } from '@gitlab/ui';
+import { GlDeprecatedButton } from '@gitlab/ui';
 import { s__, sprintf } from '~/locale';
 import Icon from '~/vue_shared/components/icon.vue';
 
 export default {
   name: 'ManualVariablesForm',
   components: {
-    GlButton,
+    GlDeprecatedButton,
     Icon,
   },
   props: {
@@ -137,9 +137,12 @@ export default {
         <div class="table-section section-10">
           <div class="table-mobile-header" role="rowheader"></div>
           <div class="table-mobile-content justify-content-end">
-            <gl-button class="btn-transparent btn-blank w-25" @click="deleteVariable(variable.id)">
+            <gl-deprecated-button
+              class="btn-transparent btn-blank w-25"
+              @click="deleteVariable(variable.id)"
+            >
               <icon name="clear" />
-            </gl-button>
+            </gl-deprecated-button>
           </div>
         </div>
       </div>
@@ -173,9 +176,9 @@ export default {
       <p class="text-muted" v-html="helpText"></p>
     </div>
     <div class="d-flex justify-content-center">
-      <gl-button variant="primary" @click="triggerManualJob(variables)">
+      <gl-deprecated-button variant="primary" @click="triggerManualJob(variables)">
         {{ action.button_title }}
-      </gl-button>
+      </gl-deprecated-button>
     </div>
   </div>
 </template>
diff --git a/app/assets/javascripts/jobs/components/sidebar.vue b/app/assets/javascripts/jobs/components/sidebar.vue
index f1683bc2195..83ba528cfa2 100644
--- a/app/assets/javascripts/jobs/components/sidebar.vue
+++ b/app/assets/javascripts/jobs/components/sidebar.vue
@@ -1,7 +1,7 @@
 <script>
 import { isEmpty } from 'lodash';
 import { mapActions, mapState } from 'vuex';
-import { GlLink, GlButton } from '@gitlab/ui';
+import { GlLink, GlDeprecatedButton } from '@gitlab/ui';
 import { __, sprintf } from '~/locale';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
 import { timeIntervalInWords } from '~/lib/utils/datetime_utility';
@@ -24,7 +24,7 @@ export default {
     StagesDropdown,
     JobsContainer,
     GlLink,
-    GlButton,
+    GlDeprecatedButton,
   },
   mixins: [timeagoMixin],
   props: {
@@ -133,14 +133,14 @@ export default {
             >
           </div>
 
-          <gl-button
+          <gl-deprecated-button
             :aria-label="__('Toggle Sidebar')"
             type="button"
             class="btn btn-blank gutter-toggle float-right d-block d-md-none js-sidebar-build-toggle"
             @click="toggleSidebar"
           >
             <i aria-hidden="true" data-hidden="true" class="fa fa-angle-double-right"></i>
-          </gl-button>
+          </gl-deprecated-button>
         </div>
 
         <div v-if="job.terminal_path || job.new_issue_path" class="block retry-link">
diff --git a/app/assets/javascripts/jobs/components/trigger_block.vue b/app/assets/javascripts/jobs/components/trigger_block.vue
index 5edb8ff555b..7c9b2824a43 100644
--- a/app/assets/javascripts/jobs/components/trigger_block.vue
+++ b/app/assets/javascripts/jobs/components/trigger_block.vue
@@ -1,12 +1,12 @@
 <script>
-import { GlButton } from '@gitlab/ui';
+import { GlDeprecatedButton } from '@gitlab/ui';
 import { __ } from '~/locale';
 
 const HIDDEN_VALUE = '••••••';
 
 export default {
   components: {
-    GlButton,
+    GlDeprecatedButton,
   },
   props: {
     trigger: {
@@ -55,11 +55,11 @@ export default {
       <p class="trigger-variables-btn-container d-flex">
         <span class="font-weight-bold">{{ __('Trigger variables:') }}</span>
 
-        <gl-button
+        <gl-deprecated-button
           v-if="hasValues"
           class="btn-sm group js-reveal-variables trigger-variables-btn"
           @click="toggleValues"
-          >{{ getToggleButtonText }}</gl-button
+          >{{ getToggleButtonText }}</gl-deprecated-button
         >
       </p>