diff options
| author | Dennis Tang <dennis@dennistang.net> | 2018-09-07 09:09:13 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-09-07 09:09:13 +0300 |
| commit | 5b74a1aebcc1712316b8269c415e83e9d59750d5 (patch) | |
| tree | a398af6332ae6fd8165981c63aecd7602a338560 /app/controllers/groups_controller.rb | |
| parent | 53fae9ad84361bbf3f9fb3db446c9bb22772fb64 (diff) | |
Resolve "Improve handling of projects shared with a group"
Diffstat (limited to 'app/controllers/groups_controller.rb')
| -rw-r--r-- | app/controllers/groups_controller.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index e57b9ff23a7..1f48c3417d0 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -17,7 +17,7 @@ class GroupsController < Groups::ApplicationController before_action :group_projects, only: [:projects, :activity, :issues, :merge_requests] before_action :event_filter, only: [:activity] - before_action :user_actions, only: [:show, :subgroups] + before_action :user_actions, only: [:show] skip_cross_project_access_check :index, :new, :create, :edit, :update, :destroy, :projects @@ -53,11 +53,7 @@ class GroupsController < Groups::ApplicationController def show respond_to do |format| - format.html do - @has_children = GroupDescendantsFinder.new(current_user: current_user, - parent_group: @group, - params: params).has_children? - end + format.html format.atom do load_events |