diff options
Diffstat (limited to 'app/controllers/groups_controller.rb')
| -rw-r--r-- | app/controllers/groups_controller.rb | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 0192b1c253e..4e50106398a 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -58,24 +58,11 @@ class GroupsController < Groups::ApplicationController def show respond_to do |format| - format.html do - render_show_html - end - - format.atom do - render_details_view_atom - end - end - end - - def details - respond_to do |format| - format.html do - render_details_html - end + format.html format.atom do - render_details_view_atom + load_events + render layout: 'xml.atom' end end end @@ -132,19 +119,6 @@ class GroupsController < Groups::ApplicationController protected - def render_show_html - render 'groups/show' - end - - def render_details_html - render 'groups/show' - end - - def render_details_view_atom - load_events - render layout: 'xml.atom', template: 'groups/show' - end - # rubocop: disable CodeReuse/ActiveRecord def authorize_create_group! allowed = if params[:parent_id].present? @@ -204,8 +178,8 @@ class GroupsController < Groups::ApplicationController .includes(:namespace) @events = EventCollection - .new(@projects, offset: params[:offset].to_i, filter: event_filter) - .to_a + .new(@projects, offset: params[:offset].to_i, filter: event_filter) + .to_a Events::RenderService .new(current_user) |