Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-30 19:40:05 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-30 19:40:05 +0300
commit93359c7e0675cef7300e5cc2f993c580d6b180fd (patch)
treef021f72f4999c71d21748df8139b583489c1e586 /app/views/groups
parent26c62cb036fa4198b20ca4a6c77dee8c8663824d (diff)
parentf28f5e49f62f8ae780d991cf266cff95e1a5c057 (diff)
Merge branch 'show-aside' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-show-aside
Diffstat (limited to 'app/views/groups')
-rw-r--r--app/views/groups/show.html.haml5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 3db0dfa59b1..1678311141e 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -13,6 +13,9 @@
.description
= escaped_autolink(@group.description)
%hr
+
+ = render 'shared/show_aside'
+
.row
%section.activities.col-md-8
.hidden-xs
@@ -33,5 +36,3 @@
= spinner
%aside.side.col-md-4
= render "projects", projects: @projects
- = link_to '#aside', class: 'show-aside' do
- %i.fa.fa-angle-left