diff options
| author | Long Nguyen <long.polyglot@gmail.com> | 2016-05-08 15:30:51 +0700 |
|---|---|---|
| committer | Long Nguyen <long.polyglot@gmail.com> | 2016-05-08 15:30:51 +0700 |
| commit | 3d4627047ae7e9947fc3924c2615fb2865f2383b (patch) | |
| tree | 608dedbabbef4ab85ad9c7b71df690776ab8caf5 /app/views/users | |
| parent | ff21f999ae705afee920ca6871f8fb151130f185 (diff) | |
| parent | 4a844b73ff2daf6b08dc36a8c7117df753b8bdd7 (diff) | |
| download | gitlab-ce-3d4627047ae7e9947fc3924c2615fb2865f2383b.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_snippets_tab_under_user_profile
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index e894a8e9395..d5f482f7168 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -88,7 +88,7 @@ %div{ class: container_class } .tab-content #activity.tab-pane - .gray-content-block.calender-block.white.second-block.hidden-xs + .row-content-block.calender-block.white.second-block.hidden-xs %div{ class: container_class } .user-calendar{data: {href: calendar_user_path}} %h4.center.light |