Merge branch '215965-issue-picker-buttons-don-t-overflow-nicely' into 'master'

Resolve "Issue picker buttons don’t overflow nicely"

Closes #215965

See merge request gitlab-org/gitlab!30636

app/views/projects/issues/show.html.haml

@@ -86,10 +86,10 @@
         -# This element is filled in using JavaScript.
 
   .content-block.emoji-block.emoji-block-sticky
-    .row
-      .col-md-12.col-lg-4.js-noteable-awards
+    .row.gl-m-0.gl-justify-content-space-between
+      .js-noteable-awards
         = render 'award_emoji/awards_block', awardable: @issue, inline: true
-      .col-md-12.col-lg-8.new-branch-col
+      .new-branch-col
         #js-vue-sort-issue-discussions
         #js-vue-discussion-filter{ data: { default_filter: current_user&.notes_filter_for(@issue), notes_filters: UserPreference.notes_filters.to_json } }
         = render 'new_branch' if show_new_branch_button?