Merge branch 'regression-commits-header-link' into 'master'

Fixed link alignment

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

(cherry picked from commit e865ee2b)

9189f14f Fixed link alignment
bf1a7910 Fixed static analysis issue
c0db4c7e Replaced class on caret
b96f9011 Replaced flex with vertical-align-middle
665c1b96 Added mr-2 class back
91b97ae6 Fixed visual issue when MR has conflicts

app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue

@@ -73,14 +73,14 @@ export default {
       <gl-button
         :aria-label="ariaLabel"
         variant="blank"
-        class="commit-edit-toggle mr-2"
+        class="commit-edit-toggle square s24 mr-2"
         @click.stop="toggle()"
       >
         <icon :name="collapseIcon" :size="16" />
       </gl-button>
       <span v-if="expanded">{{ __('Collapse') }}</span>
       <span v-else>
-        <span v-html="message"></span>
+        <span class="vertical-align-middle" v-html="message"></span>
         <gl-button variant="link" class="modify-message-button">
           {{ modifyLinkMessage }}
         </gl-button>

app/assets/stylesheets/pages/merge_requests.scss

@@ -1019,3 +1019,8 @@
   z-index: 99999;
   background: $black-transparent;
 }
+
+.source-branch-removal-status {
+  padding-left: 50px;
+  padding-bottom: $gl-padding;
+}