diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-11-21 11:09:02 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-11-21 11:09:02 +0000 |
| commit | eb3683fa65a6c943ae79352c90bd1ad3e810ef01 (patch) | |
| tree | c04091cc5071fdaf4d5433639f95b49a862758b9 /lib/api | |
| parent | e0826959ead862de5ce761b4109b84e92a6d2f53 (diff) | |
| parent | c216b25dfeccfd20de56ea2f0eb467a00f5e4933 (diff) | |
| download | gitlab-ce-eb3683fa65a6c943ae79352c90bd1ad3e810ef01.tar.gz | |
Merge branch '52453-show-subgroups-in-group-create-issue' into 'master'
Resolve "Access project from descendent groups when selecting project to create new issue"
Closes #47096 and #52453
See merge request gitlab-org/gitlab-ce!22612
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/groups.rb | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/api/groups.rb b/lib/api/groups.rb index 64b998ab455..b3d10721692 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -60,7 +60,17 @@ module API def find_group_projects(params) group = find_group!(params[:id]) - projects = GroupProjectsFinder.new(group: group, current_user: current_user, params: project_finder_params).execute + options = { + only_owned: !params[:with_shared], + include_subgroups: params[:include_subgroups] + } + + projects = GroupProjectsFinder.new( + group: group, + current_user: current_user, + params: project_finder_params, + options: options + ).execute projects = projects.with_issues_available_for_user(current_user) if params[:with_issues_enabled] projects = projects.with_merge_requests_enabled if params[:with_merge_requests_enabled] projects = reorder_projects(projects) @@ -201,6 +211,8 @@ module API optional :starred, type: Boolean, default: false, desc: 'Limit by starred status' optional :with_issues_enabled, type: Boolean, default: false, desc: 'Limit by enabled issues feature' optional :with_merge_requests_enabled, type: Boolean, default: false, desc: 'Limit by enabled merge requests feature' + optional :with_shared, type: Boolean, default: true, desc: 'Include projects shared to this group' + optional :include_subgroups, type: Boolean, default: false, desc: 'Includes projects in subgroups of this group' use :pagination use :with_custom_attributes |