Skip to content

G
gitlab-ce
Commit 314d523a authored by GitLab Bot's avatar GitLab Bot
Browse files
Options

Automatic merge of gitlab-org/gitlab-ce master

parents 1688c6f6 06ceb597
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 14 deletions
app/views/users/_overview.html.haml
View file @ 314d523a
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
.col-md-12.col-lg-6 .col-md-12.col-lg-6
- if can?(current_user, :read_cross_project) - if can?(current_user, :read_cross_project)
.activities-block .activities-block
.append-right-5
.prepend-top-16 .prepend-top-16
.d-flex.align-items-center.border-bottom .d-flex.align-items-center.border-bottom
%h4.flex-grow %h4.flex-grow
...@@ -20,6 +21,7 @@ ...@@ -20,6 +21,7 @@
.col-md-12.col-lg-6 .col-md-12.col-lg-6
.projects-block .projects-block
.prepend-left-5
.prepend-top-16 .prepend-top-16
.d-flex.align-items-center.border-bottom .d-flex.align-items-center.border-bottom
%h4.flex-grow %h4.flex-grow
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7