diff options
| author | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2019-08-31 10:21:29 +0000 |
|---|---|---|
| committer | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2019-08-31 10:21:29 +0000 |
| commit | 8898ea87bae5b171ec2d22772e3b0d10a2f73975 (patch) | |
| tree | d66514b646191d79f95346886be9481ec0cb2d64 /lib/api/groups.rb | |
| parent | cc70c6a54aa64425dfa8a3896625b308a83536c3 (diff) | |
| parent | 195ac30514e98b0f97bd191183124f06d1d221fc (diff) | |
| download | gitlab-ce-patch-73-move-storage-shards.tar.gz | |
Merge branch 'master' into 'patch-73-move-storage-shards'patch-73-move-storage-shards
# Conflicts:
# app/models/project.rb
# spec/models/project_spec.rb
Diffstat (limited to 'lib/api/groups.rb')
| -rw-r--r-- | lib/api/groups.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/groups.rb b/lib/api/groups.rb index f545f33c06b..0bcd09d3977 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -216,6 +216,7 @@ module API use :pagination use :with_custom_attributes + use :optional_projects_params end get ":id/projects" do projects = find_group_projects(params) |