diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 20:02:30 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 20:02:30 +0000 |
| commit | 41fe97390ceddf945f3d967b8fdb3de4c66b7dea (patch) | |
| tree | 9c8d89a8624828992f06d892cd2f43818ff5dcc8 /app/controllers/groups_controller.rb | |
| parent | 0804d2dc31052fb45a1efecedc8e06ce9bc32862 (diff) | |
| download | gitlab-ce-14.9.0-rc42.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42
Diffstat (limited to 'app/controllers/groups_controller.rb')
| -rw-r--r-- | app/controllers/groups_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 12af76efe0d..b53d9b1be04 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -212,7 +212,7 @@ class GroupsController < Groups::ApplicationController def issues return super if !html_request? || Feature.disabled?(:vue_issues_list, group, default_enabled: :yaml) - @has_issues = IssuesFinder.new(current_user, group_id: group.id).execute + @has_issues = IssuesFinder.new(current_user, group_id: group.id, include_subgroups: true).execute .non_archived .exists? @@ -235,7 +235,7 @@ class GroupsController < Groups::ApplicationController def render_details_view_atom load_events - render layout: 'xml.atom', template: 'groups/show' + render layout: 'xml', template: 'groups/show' end # rubocop: disable CodeReuse/ActiveRecord |