diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-03-08 21:01:33 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-03-10 10:38:36 -0300 |
| commit | c3e70280dffe7ee0859ebd73b902d424ca5f809a (patch) | |
| tree | 06b83a5ab13d19803332253cf50a941501b29317 /app/controllers/users_controller.rb | |
| parent | bd59e59d01c5e845c7f7d451feaa1488670f20de (diff) | |
| download | gitlab-ce-c3e70280dffe7ee0859ebd73b902d424ca5f809a.tar.gz | |
Prevent projects to have higher visibility than groups
Prevent Groups to have smaller visibility than projects
Add default_group_visibility_level to configuration
Code improvements
Diffstat (limited to 'app/controllers/users_controller.rb')
| -rw-r--r-- | app/controllers/users_controller.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d26a1ce6737..7b32572f822 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,16 +3,13 @@ class UsersController < ApplicationController before_action :set_user def show -<<<<<<< HEAD -======= @contributed_projects = contributed_projects.joined(@user).reject(&:forked?) @projects = PersonalProjectsFinder.new(@user).execute(current_user) @projects = @projects.page(params[:page]).per(PER_PAGE) - @groups = @user.groups.order_id_desc + @groups = JoinedGroupsFinder.new(@user).execute(current_user) ->>>>>>> Code improvements respond_to do |format| format.html |