Add latest changes from gitlab-org/gitlab@master

3 files changed, 19 insertions, 19 deletions

diff --git a/app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue b/app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue
index 0460181558b..32fe841f16e 100644
--- a/app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue
+++ b/app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue
@@ -4,7 +4,7 @@ import { mapActions, mapState } from 'vuex';
 import { ADD_CI_VARIABLE_MODAL_ID } from '../constants';
 import CiEnvironmentsDropdown from './ci_environments_dropdown.vue';
 import {
-  GlButton,
+  GlDeprecatedButton,
   GlModal,
   GlFormSelect,
   GlFormGroup,
@@ -19,7 +19,7 @@ export default {
   modalId: ADD_CI_VARIABLE_MODAL_ID,
   components: {
     CiEnvironmentsDropdown,
-    GlButton,
+    GlDeprecatedButton,
     GlModal,
     GlFormSelect,
     GlFormGroup,
@@ -212,22 +212,22 @@ export default {
       </gl-form-group>
     </form>
     <template #modal-footer>
-      <gl-button @click="hideModal">{{ __('Cancel') }}</gl-button>
-      <gl-button
+      <gl-deprecated-button @click="hideModal">{{ __('Cancel') }}</gl-deprecated-button>
+      <gl-deprecated-button
         v-if="variableBeingEdited"
         ref="deleteCiVariable"
         category="secondary"
         variant="danger"
         @click="deleteVarAndClose"
-        >{{ __('Delete variable') }}</gl-button
+        >{{ __('Delete variable') }}</gl-deprecated-button
       >
-      <gl-button
+      <gl-deprecated-button
         ref="updateOrAddVariable"
         :disabled="!canSubmit"
         variant="success"
         @click="updateOrAddVariable"
         >{{ modalActionText }}
-      </gl-button>
+      </gl-deprecated-button>
     </template>
   </gl-modal>
 </template>
diff --git a/app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue b/app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue
index c4b1bc18f5a..07b0d55bd4c 100644
--- a/app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue
+++ b/app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue
@@ -1,12 +1,12 @@
 <script>
-import { GlPopover, GlIcon, GlButton, GlTooltipDirective } from '@gitlab/ui';
+import { GlPopover, GlIcon, GlDeprecatedButton, GlTooltipDirective } from '@gitlab/ui';
 
 export default {
   maxTextLength: 95,
   components: {
     GlPopover,
     GlIcon,
-    GlButton,
+    GlDeprecatedButton,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -41,14 +41,14 @@ export default {
     <gl-popover :target="target" triggers="hover" placement="top" container="popover-container">
       <div class="d-flex justify-content-between position-relative">
         <div class="pr-5 w-100 ci-popover-value">{{ displayValue }}</div>
-        <gl-button
+        <gl-deprecated-button
           v-gl-tooltip
           class="btn-transparent btn-clipboard position-absolute position-top-0 position-right-0"
           :title="tooltipText"
           :data-clipboard-text="value"
         >
           <gl-icon name="copy-to-clipboard" />
-        </gl-button>
+        </gl-deprecated-button>
       </div>
     </gl-popover>
   </div>
diff --git a/app/assets/javascripts/ci_variable_list/components/ci_variable_table.vue b/app/assets/javascripts/ci_variable_list/components/ci_variable_table.vue
index 806fa3e1191..b374d950c1f 100644
--- a/app/assets/javascripts/ci_variable_list/components/ci_variable_table.vue
+++ b/app/assets/javascripts/ci_variable_list/components/ci_variable_table.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlTable, GlButton, GlModalDirective, GlIcon } from '@gitlab/ui';
+import { GlTable, GlDeprecatedButton, GlModalDirective, GlIcon } from '@gitlab/ui';
 import { s__, __ } from '~/locale';
 import { mapState, mapActions } from 'vuex';
 import { ADD_CI_VARIABLE_MODAL_ID } from '../constants';
@@ -52,7 +52,7 @@ export default {
   ],
   components: {
     GlTable,
-    GlButton,
+    GlDeprecatedButton,
     GlIcon,
     CiVariablePopover,
   },
@@ -147,13 +147,13 @@ export default {
         </div>
       </template>
       <template #cell(actions)="{ item }">
-        <gl-button
+        <gl-deprecated-button
           ref="edit-ci-variable"
           v-gl-modal-directive="$options.modalId"
           @click="editVariable(item)"
         >
           <gl-icon :size="$options.iconSize" name="pencil" />
-        </gl-button>
+        </gl-deprecated-button>
       </template>
       <template #empty>
         <p ref="empty-variables" class="text-center empty-variables text-plain">
@@ -165,20 +165,20 @@ export default {
       class="ci-variable-actions d-flex justify-content-end"
       :class="{ 'justify-content-center': !tableIsNotEmpty }"
     >
-      <gl-button
+      <gl-deprecated-button
         v-if="tableIsNotEmpty"
         ref="secret-value-reveal-button"
         data-qa-selector="reveal_ci_variable_value"
         class="append-right-8"
         @click="toggleValues(!valuesHidden)"
-        >{{ valuesButtonText }}</gl-button
+        >{{ valuesButtonText }}</gl-deprecated-button
       >
-      <gl-button
+      <gl-deprecated-button
         ref="add-ci-variable"
         v-gl-modal-directive="$options.modalId"
         data-qa-selector="add_ci_variable"
         variant="success"
-        >{{ __('Add Variable') }}</gl-button
+        >{{ __('Add Variable') }}</gl-deprecated-button
       >
     </div>
   </div>