Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
5d177920
Commit
5d177920
authored
Jan 15, 2020
by
Dmitry Gruzd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include subgroups when searching inside a group
parent
c820b470
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
changelogs/unreleased/include-subgroups-in-group-search.yml
changelogs/unreleased/include-subgroups-in-group-search.yml
+5
-0
lib/gitlab/group_search_results.rb
lib/gitlab/group_search_results.rb
+1
-1
spec/lib/gitlab/group_search_results_spec.rb
spec/lib/gitlab/group_search_results_spec.rb
+6
-0
No files found.
changelogs/unreleased/include-subgroups-in-group-search.yml
0 → 100644
View file @
5d177920
---
title
:
Include subgroups when searching inside a group
merge_request
:
22991
author
:
type
:
fixed
lib/gitlab/group_search_results.rb
View file @
5d177920
...
@@ -30,7 +30,7 @@ module Gitlab
...
@@ -30,7 +30,7 @@ module Gitlab
# rubocop:enable CodeReuse/ActiveRecord
# rubocop:enable CodeReuse/ActiveRecord
def
issuable_params
def
issuable_params
super
.
merge
(
group_id:
group
.
id
)
super
.
merge
(
group_id:
group
.
id
,
include_subgroups:
true
)
end
end
end
end
end
end
spec/lib/gitlab/group_search_results_spec.rb
View file @
5d177920
...
@@ -67,5 +67,11 @@ describe Gitlab::GroupSearchResults do
...
@@ -67,5 +67,11 @@ describe Gitlab::GroupSearchResults do
expect
(
result
).
to
eq
[]
expect
(
result
).
to
eq
[]
end
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
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment