Commit e162c83c authored by Nick Thomas's avatar Nick Thomas

Merge branch 'include-subgroups-in-group-search' into 'master'

Include subgroups when searching inside a group

Closes #22599

See merge request gitlab-org/gitlab!22991
parents b762cdec 5d177920
---
title: Include subgroups when searching inside a group
merge_request: 22991
author:
type: fixed
......@@ -30,7 +30,7 @@ module Gitlab
# rubocop:enable CodeReuse/ActiveRecord
def issuable_params
super.merge(group_id: group.id)
super.merge(group_id: group.id, include_subgroups: true)
end
end
end
......@@ -67,5 +67,11 @@ describe Gitlab::GroupSearchResults do
expect(result).to eq []
end
it 'sets include_subgroups flag by default' do
result = described_class.new(user, anything, group, 'gob')
expect(result.issuable_params[:include_subgroups]).to eq(true)
end
end
end
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