Read about our upcoming Code of Conduct on this issue

This instance will be upgraded to Heptapod 0.28.1 on 2022-01-26 at 16:00 UTC+1 (a few minutes of down time)

Commit d310a2d0 authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'bvl-fix-group-atom-feed' into 'master'

Make sure we render events for projects within a group

Closes #39305

See merge request gitlab-org/gitlab-ce!14974
......@@ -141,6 +141,17 @@ def group_params_ce
end
def load_events
params[:sort] ||= 'latest_activity_desc'
options = {}
options[:only_owned] = true if params[:shared] == '0'
options[:only_shared] = true if params[:shared] == '1'
@projects = GroupProjectsFinder.new(params: params, group: group, options: options, current_user: current_user)
.execute
.includes(:namespace)
.page(params[:page])
@events = EventCollection
.new(@projects, offset: params[:offset].to_i, filter: event_filter)
.to_a
......
---
title: Fix the atom feed for group events
merge_request: 14974
author:
type: fixed
......@@ -32,6 +32,31 @@
end
end
describe 'GET #show' do
before do
sign_in(user)
project
end
context 'as html' do
it 'assigns whether or not a group has children' do
get :show, id: group.to_param
expect(assigns(:has_children)).to be_truthy
end
end
context 'as atom' do
it 'assigns events for all the projects in the group' do
create(:event, project: project)
get :show, id: group.to_param, format: :atom
expect(assigns(:events)).not_to be_empty
end
end
end
describe 'GET #new' do
context 'when creating subgroups', :nested_groups do
[true, false].each do |can_create_group_status|
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment