diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-02-22 07:55:30 -0700 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-02-22 07:55:30 -0700 |
| commit | 5a8d8b6f20ab795fddcf651a7298f61696c7e2ab (patch) | |
| tree | efad20db1967808cb278f903cda3f6d87d933d87 /app/views/groups | |
| parent | 64a7ecc9267f6f82d34b9e87a0271216c94cbbfd (diff) | |
| parent | 44dbbb76fc134826b80fa10aac60bf8c79ba01e7 (diff) | |
| download | gitlab-ce-5a8d8b6f20ab795fddcf651a7298f61696c7e2ab.tar.gz | |
Merge branch 'master' into rails-4.1.9
Conflicts:
app/views/dashboard/projects.html.haml
Diffstat (limited to 'app/views/groups')
| -rw-r--r-- | app/views/groups/show.html.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index d5af859ee62..a453889f744 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -9,7 +9,7 @@ = escaped_autolink(@group.description) %hr .row - %section.activities.col-md-8.hidden-sm.hidden-xs + %section.activities.col-md-8 - if current_user = render "events/event_last_push", event: @last_push = render 'shared/event_filter' @@ -17,3 +17,5 @@ = spinner %aside.side.col-md-4 = render "projects", projects: @projects + = link_to '#aside', class: 'show-aside' do + %i.fa.fa-angle-left |