Merge branch '3637-small-button' into 'master'

btn-small -> btn-sm

Closes #3637

See merge request gitlab-org/gitlab-ee!3210

app/assets/javascripts/issuable/related_issues/components/related_issues_block.vue

@@ -119,7 +119,7 @@ export default {
               v-if="canAddRelatedIssues"
               ref="issueCountBadgeAddButton"
               type="button"
-              class="js-issue-count-badge-add-button issue-count-badge-add-button btn btn-small btn-default"
+              class="js-issue-count-badge-add-button issue-count-badge-add-button btn btn-sm btn-default"
               aria-label="Add an issue"
               data-placement="top"
               @click="toggleAddRelatedIssuesForm">

changelogs/unreleased-ee/3637-small-button.yml

+---
+title: fix height of rebase and approve buttons
+merge_request:
+author:
+type: fixed

ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_body.js

@@ -75,7 +75,7 @@ export default {
         <button
           :disabled="approving"
           @click="approveMergeRequest"
-          class="btn btn-primary btn-small approve-btn">
+          class="btn btn-primary btn-sm approve-btn">
           <i
             v-if="approving"
             class="fa fa-spinner fa-spin"

ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_footer.js

@@ -93,7 +93,7 @@ export default {
           type="button"
           :disabled="unapproving"
           @click="unapproveMergeRequest"
-          class="btn btn-small unapprove-btn-wrap">
+          class="btn btn-sm unapprove-btn-wrap">
           <i
             v-if="unapproving"
             class="fa fa-spinner fa-spin"

ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue

@@ -109,7 +109,7 @@
         <div class="accept-merge-holder clearfix js-toggle-container accept-action media space-children">
           <button
             type="button"
-            class="btn btn-small btn-reopen btn-success"
+            class="btn btn-sm btn-reopen btn-success"
             :disabled="isMakingRequest"
             @click="rebase">
             <loading-icon v-if="isMakingRequest" />