diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-11 18:42:16 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-11 18:42:16 +0100 |
| commit | f8163c81e7c765ea654ea81818eb3f8a9da7648e (patch) | |
| tree | bffe29c172d8fa94eae3d6b84b3492071a66a092 /app/controllers/groups_controller.rb | |
| parent | 746ac56b6f92991bc15d3cd787094b9555825ac3 (diff) | |
| download | gitlab-ce-f8163c81e7c765ea654ea81818eb3f8a9da7648e.tar.gz | |
Show shared projects on group page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/groups_controller.rb')
| -rw-r--r-- | app/controllers/groups_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index f05c29e9974..bd6b44bdbbc 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -46,6 +46,8 @@ class GroupsController < Groups::ApplicationController @projects = @projects.sort(@sort = params[:sort]) @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank? + @shared_projects = @group.shared_projects + respond_to do |format| format.html |