Merge branch 'jivl-fix-cancel-auto-merge-button-height' into 'master'

Fix cancel automatic merge button height

Closes #48052

See merge request gitlab-org/gitlab-ce!19977

app/assets/stylesheets/pages/merge_requests.scss

@@ -46,6 +46,7 @@
 
   .btn {
     font-size: $gl-font-size;
+    max-height: 26px;
 
     &[disabled] {
       opacity: 0.3;