Merge branch '48985-diverged-from-upstream-label' into 'master'

Add left-padding to diverged-from-upstream label

Closes #7007

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

app/views/projects/branches/_branch.html.haml

@@ -22,7 +22,7 @@
           = s_('Branches|protected')
 
       - if @project.mirror_ever_updated_successfully? && @repository.diverged_from_upstream?(branch.name)
-        %span.badge.badge-danger.has-tooltip{ data: { html: "true", title: branch_diverged_tooltip_message } }
+        %span.badge.badge-danger.prepend-left-5.has-tooltip{ data: { html: "true", title: branch_diverged_tooltip_message } }
           = icon('exclamation-triangle')
           = s_('Branches|diverged from upstream')
 

ee/changelogs/unreleased/48985-diverged-from-upstream-label.yml

+---
+title: Add left-padding to diverged-from-upstream label
+merge_request: 6647
+author:
+type: fixed