Commit 77399b2e authored by Rémy Coutable's avatar Rémy Coutable
Browse files

Merge branch 'sh-fix-events-collection' into 'master'

Fix not all events being shown in group dashboard

Closes #42560

See merge request gitlab-org/gitlab-ce!16819
......@@ -150,7 +150,6 @@ def load_events
@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)
......
---
title: Fix not all events being shown in group dashboard
merge_request:
author:
type: fixed
......@@ -85,6 +85,30 @@
end
end
describe 'GET #activity' do
render_views
before do
sign_in(user)
project
end
context 'as json' do
it 'includes all projects in event feed' do
3.times do
project = create(:project, group: group)
create(:event, project: project)
end
get :activity, id: group.to_param, format: :json
expect(response).to have_gitlab_http_status(200)
expect(json_response['count']).to eq(3)
expect(assigns(:projects).limit_value).to be_nil
end
end
end
describe 'POST #create' 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