Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/pages/profile.scss

@@ -249,6 +249,16 @@
     .event-item {
       padding-left: 40px;
     }
+
+    @include media-breakpoint-up(lg) {
+      margin-right: 5px;
+    }
+  }
+
+  .projects-block {
+    @include media-breakpoint-up(lg) {
+      margin-left: 5px;
+    }
   }
 
   @include media-breakpoint-down(xs) {

app/views/users/_overview.html.haml

@@ -9,24 +9,22 @@
   .col-md-12.col-lg-6
     - if can?(current_user, :read_cross_project)
       .activities-block
-        .append-right-5
-          .prepend-top-16
-            .d-flex.align-items-center.border-bottom
-              %h4.flex-grow
-                = s_('UserProfile|Activity')
-              = link_to s_('UserProfile|View all'), user_activity_path, class: "hide js-view-all"
-            .overview-content-list{ data: { href: user_path } }
-              .center.light.loading
-                = spinner nil, true
-
-  .col-md-12.col-lg-6
-    .projects-block
-      .prepend-left-5
         .prepend-top-16
           .d-flex.align-items-center.border-bottom
             %h4.flex-grow
-              = s_('UserProfile|Personal projects')
-            = link_to s_('UserProfile|View all'), user_projects_path, class: "hide js-view-all"
-          .overview-content-list{ data: { href: user_projects_path } }
+              = s_('UserProfile|Activity')
+            = link_to s_('UserProfile|View all'), user_activity_path, class: "hide js-view-all"
+          .overview-content-list{ data: { href: user_path } }
             .center.light.loading
               = spinner nil, true
+
+  .col-md-12.col-lg-6
+    .projects-block
+      .prepend-top-16
+        .d-flex.align-items-center.border-bottom
+          %h4.flex-grow
+            = s_('UserProfile|Personal projects')
+          = link_to s_('UserProfile|View all'), user_projects_path, class: "hide js-view-all"
+        .overview-content-list{ data: { href: user_projects_path } }
+          .center.light.loading
+            = spinner nil, true

changelogs/unreleased/56010-user-profile-page-horizonal-whitespace-between-overview-columns-breaks-two-column-layout.yml

+---
+title: Remove horizontal whitespace on user profile overview on small breakpoints
+merge_request: 24189
+author:
+type: other