Merge branch...

Merge branch '229312-migrate-bootstrap-button-to-gitlab-ui-glbutton-in-ee-app-assets-javascripts-analytics' into 'master'

Resolve "Migrate Bootstrap button to GitLab UI GlButton in ee/app/assets/javascripts/analytics/cycle_analytics/components/custom_stage_form.vue"

See merge request gitlab-org/gitlab!43212

ee/app/assets/javascripts/analytics/cycle_analytics/components/custom_stage_form.vue

@@ -10,6 +10,7 @@ import {
   GlDropdownSectionHeader,
   GlDropdownItem,
   GlSprintf,
+  GlButton,
 } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import { convertObjectPropsToSnakeCase } from '~/lib/utils/common_utils';
@@ -80,6 +81,7 @@ export default {
     GlDropdownSectionHeader,
     GlDropdownItem,
     GlSprintf,
+    GlButton,
   },
   props: {
     events: {
@@ -363,23 +365,24 @@ export default {
       </div>
     </div>
     <div class="custom-stage-form-actions">
-      <button
+      <gl-button
         :disabled="!isDirty"
-        class="btn btn-cancel js-save-stage-cancel"
-        type="button"
+        category="primary"
+        class="js-save-stage-cancel"
         @click="handleCancel"
       >
         {{ __('Cancel') }}
-      </button>
-      <button
+      </gl-button>
+      <gl-button
         :disabled="!isComplete || !isDirty"
-        type="button"
-        class="js-save-stage btn btn-success"
+        variant="success"
+        category="primary"
+        class="js-save-stage"
         @click="handleSave"
       >
         <gl-loading-icon v-if="isSavingCustomStage" size="sm" inline />
         {{ saveStageText }}
-      </button>
+      </gl-button>
     </div>
     <div class="mt-2">
       <gl-sprintf

ee/spec/frontend/analytics/cycle_analytics/components/__snapshots__/custom_stage_form_spec.js.snap

 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`CustomStageForm Editing a custom stage isSavingCustomStage=true displays a loading icon 1`] = `
-"<button disabled=\\"disabled\\" type=\\"button\\" class=\\"js-save-stage btn btn-success\\"><span class=\\"gl-spinner-container\\"><span aria-label=\\"Loading\\" class=\\"align-text-bottom gl-spinner gl-spinner-orange gl-spinner-sm\\"></span></span>
+"<button type=\\"button\\" disabled=\\"disabled\\" class=\\"btn js-save-stage btn-success btn-md disabled gl-button\\">
+  <!---->
+  <!----> <span class=\\"gl-button-text\\"><span class=\\"gl-spinner-container\\"><span aria-label=\\"Loading\\" class=\\"align-text-bottom gl-spinner gl-spinner-orange gl-spinner-sm\\"></span></span>
   Update stage
-</button>"
+  </span></button>"
 `;
 
 exports[`CustomStageForm isSavingCustomStage=true displays a loading icon 1`] = `
-"<button disabled=\\"disabled\\" type=\\"button\\" class=\\"js-save-stage btn btn-success\\"><span class=\\"gl-spinner-container\\"><span aria-label=\\"Loading\\" class=\\"align-text-bottom gl-spinner gl-spinner-orange gl-spinner-sm\\"></span></span>
+"<button type=\\"button\\" disabled=\\"disabled\\" class=\\"btn js-save-stage btn-success btn-md disabled gl-button\\">
+  <!---->
+  <!----> <span class=\\"gl-button-text\\"><span class=\\"gl-spinner-container\\"><span aria-label=\\"Loading\\" class=\\"align-text-bottom gl-spinner gl-spinner-orange gl-spinner-sm\\"></span></span>
   Add stage
-</button>"
+  </span></button>"
 `;