Merge branch '3163-button-spacing' into 'master'

fix Modify commit message button spacing

Closes #3163

See merge request !2693

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js

@@ -283,15 +283,14 @@ export default {
               <span v-if="mr.ffOnlyEnabled">
                 Fast-forward merge without a merge commit
               </span>
-              <span v-else>
-                <button
-                  @click="toggleCommitMessageEditor"
-                  :disabled="isMergeButtonDisabled"
-                  class="btn btn-default btn-xs"
-                  type="button">
-                  Modify commit message
-                </button>
-              </span>
+              <button
+                v-else
+                @click="toggleCommitMessageEditor"
+                :disabled="isMergeButtonDisabled"
+                class="btn btn-default btn-xs"
+                type="button">
+                Modify commit message
+              </button>
             </template>
             <template v-else>
               <span class="bold">

ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js

@@ -24,7 +24,7 @@ export default {
     },
   },
   template: `
-    <div class="accept-control spacing inline">
+    <div class="accept-control inline">
       <label class="merge-param-checkbox">
         <input
           type="checkbox"