Merge branch '10364-dismissal-reason-FE-CE' into 'master'

Adds the CE backport for EE!11226

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

app/assets/stylesheets/framework/modal.scss

@@ -53,7 +53,8 @@
   flex-direction: row;
 
   .btn + .btn:not(.dropdown-toggle-split),
-  .btn + .btn-group {
+  .btn + .btn-group,
+  .btn-group + .btn {
     margin-left: $grid-size;
   }
 
@@ -61,7 +62,8 @@
     flex-direction: column;
 
     .btn + .btn:not(.dropdown-toggle-split),
-    .btn + .btn-group {
+    .btn + .btn-group,
+    .btn-group + .btn {
       margin-left: 0;
       margin-top: $grid-size;
     }