diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-05-26 11:30:11 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-05-26 11:30:11 +0300 |
| commit | adc64e4583dc42399f681a9b17490f98b8c4bec0 (patch) | |
| tree | a80723a31b277b83d69d96e4f00400bbcc0869a0 /app/views/users/show.html.haml | |
| parent | 997178220008696576ffb5cdee6cb9d0e7a44055 (diff) | |
| parent | 3d009f77853261d43f1d5302d8016f4641ba5fca (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app/views/users/show.html.haml')
| -rw-r--r-- | app/views/users/show.html.haml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 9017fd54fcc..0c513308308 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -89,10 +89,9 @@ .tab-content #activity.tab-pane .row-content-block.calender-block.white.second-block.hidden-xs - %div{ class: container_class } - .user-calendar{data: {href: user_calendar_path}} - %h4.center.light - %i.fa.fa-spinner.fa-spin + .user-calendar{data: {href: user_calendar_path}} + %h4.center.light + %i.fa.fa-spinner.fa-spin .user-calendar-activities .content_list{ data: {href: user_path} } |