Merge branch...

Merge branch '349115-lock-and-history-buttons-for-folders-don-t-have-margin-between-them' into 'master'

Fix spacing between Lock and History button in folder view

See merge request gitlab-org/gitlab!77233

app/assets/javascripts/repository/index.js

@@ -163,7 +163,7 @@ export default function setupVueRepositoryList() {
             }`,
             // Ideally passing this class to `props` should work
             // But it doesn't work here. :(
-            class: 'btn btn-default btn-md gl-button ml-sm-0',
+            class: 'btn btn-default btn-md gl-button',
           },
         },
         [__('History')],

app/assets/stylesheets/utilities.scss

@@ -58,6 +58,13 @@
   }
 }
 
+.gl-first-child-ml-sm-0 > a:first-child,
+.gl-first-child-ml-sm-0 > button:first-child {
+  @include media-breakpoint-up(sm) {
+    @include gl-ml-0;
+  }
+}
+
 .mh-50vh { max-height: 50vh; }
 
 .min-width-0 {

app/views/projects/tree/_tree_header.html.haml

@@ -6,7 +6,7 @@
 
 #js-blob-controls
 .tree-controls
-  .d-block.d-sm-flex.flex-wrap.align-items-start.gl-children-ml-sm-3<
+  .d-block.d-sm-flex.flex-wrap.align-items-start.gl-children-ml-sm-3.gl-first-child-ml-sm-0<
     = render_if_exists 'projects/tree/lock_link'
     #js-tree-history-link{ data: { history_link: project_commits_path(@project, @ref) } }