Add latest changes from gitlab-org/gitlab@12-10-stable-ee

2 files changed, 12 insertions, 12 deletions

diff --git a/app/assets/javascripts/releases/components/app_edit.vue b/app/assets/javascripts/releases/components/app_edit.vue
index df356c18417..8d68ff02116 100644
--- a/app/assets/javascripts/releases/components/app_edit.vue
+++ b/app/assets/javascripts/releases/components/app_edit.vue
@@ -1,6 +1,6 @@
 <script>
 import { mapState, mapActions, mapGetters } from 'vuex';
-import { GlNewButton, GlFormInput, GlFormGroup } from '@gitlab/ui';
+import { GlButton, GlFormInput, GlFormGroup } from '@gitlab/ui';
 import { escape as esc } from 'lodash';
 import { __, sprintf } from '~/locale';
 import MarkdownField from '~/vue_shared/components/markdown/field.vue';
@@ -15,7 +15,7 @@ export default {
   components: {
     GlFormInput,
     GlFormGroup,
-    GlNewButton,
+    GlButton,
     MarkdownField,
     AssetLinksForm,
   },
@@ -167,7 +167,7 @@ export default {
       <asset-links-form v-if="showAssetLinksForm" />
 
       <div class="d-flex pt-3">
-        <gl-new-button
+        <gl-button
           class="mr-auto js-no-auto-disable"
           category="primary"
           variant="success"
@@ -176,10 +176,10 @@ export default {
           :disabled="isSaveChangesDisabled"
         >
           {{ __('Save changes') }}
-        </gl-new-button>
-        <gl-new-button :href="cancelPath" class="js-cancel-button">
+        </gl-button>
+        <gl-button :href="cancelPath" class="js-cancel-button">
           {{ __('Cancel') }}
-        </gl-new-button>
+        </gl-button>
       </div>
     </form>
   </div>
diff --git a/app/assets/javascripts/releases/components/asset_links_form.vue b/app/assets/javascripts/releases/components/asset_links_form.vue
index 6ca700c2b30..4bdc88f01dd 100644
--- a/app/assets/javascripts/releases/components/asset_links_form.vue
+++ b/app/assets/javascripts/releases/components/asset_links_form.vue
@@ -4,7 +4,7 @@ import {
   GlSprintf,
   GlLink,
   GlFormGroup,
-  GlNewButton,
+  GlButton,
   GlIcon,
   GlTooltipDirective,
   GlFormInput,
@@ -12,7 +12,7 @@ import {
 
 export default {
   name: 'AssetLinksForm',
-  components: { GlSprintf, GlLink, GlFormGroup, GlNewButton, GlIcon, GlFormInput },
+  components: { GlSprintf, GlLink, GlFormGroup, GlButton, GlIcon, GlFormInput },
   directives: { GlTooltip: GlTooltipDirective },
   computed: {
     ...mapState('detail', ['release', 'releaseAssetsDocsPath']),
@@ -170,7 +170,7 @@ export default {
       </gl-form-group>
 
       <div class="mb-5 mb-sm-3 mt-sm-4 col col-sm-auto">
-        <gl-new-button
+        <gl-button
           v-gl-tooltip
           class="remove-button w-100"
           :aria-label="__('Remove asset link')"
@@ -179,16 +179,16 @@ export default {
         >
           <gl-icon class="mr-1 mr-sm-0 mb-1" :size="16" name="remove" />
           <span class="d-inline d-sm-none">{{ __('Remove asset link') }}</span>
-        </gl-new-button>
+        </gl-button>
       </div>
     </div>
-    <gl-new-button
+    <gl-button
       ref="addAnotherLinkButton"
       variant="link"
       class="align-self-end mb-5 mb-sm-0"
       @click="onAddAnotherClicked"
     >
       {{ __('Add another link') }}
-    </gl-new-button>
+    </gl-button>
   </div>
 </template>