Automatic merge of gitlab-org/gitlab-ce master

314d523a · GitLab Bot · 1688c6f6 · 06ceb597 · 314d523a
Commit 314d523a authored Dec 17, 2018 by GitLab Bot
Show whitespace changes
Inline Side-by-side

Showing with 16 additions and 14 deletions

app/views/users/_overview.html.haml app/views/users/_overview.html.haml +16 -14

No files found.
--- a/app/views/users/_overview.html.haml
+++ b/app/views/users/_overview.html.haml
@@ -9,6 +9,7 @@
  .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
@@ -20,6 +21,7 @@

  .col-md-12.col-lg-6
    .projects-block
+      .prepend-left-5
        .prepend-top-16
          .d-flex.align-items-center.border-bottom
            %h4.flex-grow