diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-03-01 12:22:29 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-03-10 10:38:36 -0300 |
| commit | f2a9ee258e0ee3a6fe0cb614e4b73c56dcd7339d (patch) | |
| tree | 84e668890ee51355f7ac9275012fbee3e295f5c4 /app/controllers | |
| parent | 60ddd5ef34686e1ea9edc82a6915a9e4738bee50 (diff) | |
| download | gitlab-ce-f2a9ee258e0ee3a6fe0cb614e4b73c56dcd7339d.tar.gz | |
Add permission level to groups
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/explore/groups_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/groups_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/explore/groups_controller.rb b/app/controllers/explore/groups_controller.rb index a9bf4321f73..9575a87ee41 100644 --- a/app/controllers/explore/groups_controller.rb +++ b/app/controllers/explore/groups_controller.rb @@ -1,6 +1,6 @@ class Explore::GroupsController < Explore::ApplicationController def index - @groups = Group.order_id_desc + @groups = GroupsFinder.new.execute(current_user) @groups = @groups.search(params[:search]) if params[:search].present? @groups = @groups.sort(@sort = params[:sort]) @groups = @groups.page(params[:page]).per(PER_PAGE) diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index f05c29e9974..13de19bc141 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -131,7 +131,7 @@ class GroupsController < Groups::ApplicationController end def group_params - params.require(:group).permit(:name, :description, :path, :avatar, :public) + params.require(:group).permit(:name, :description, :path, :avatar, :public, :visibility_level) end def load_events |