diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-10 18:08:27 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-10 18:08:27 +0000 |
| commit | 56b3925584320c4406b7cb961fbe19ff9f9c41d4 (patch) | |
| tree | ea7fdd802d958c585ecf46045ccf1db52417b096 /lib | |
| parent | 758b97662c5a6af41357cec7e25fc8cddadd8b9c (diff) | |
| download | gitlab-ce-56b3925584320c4406b7cb961fbe19ff9f9c41d4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/admin/plan_limits.rb | 1 | ||||
| -rw-r--r-- | lib/api/entities/plan_limit.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/admin/plan_limits.rb b/lib/api/admin/plan_limits.rb index 1dbcf812085..7ce70d85d46 100644 --- a/lib/api/admin/plan_limits.rb +++ b/lib/api/admin/plan_limits.rb @@ -51,6 +51,7 @@ module API optional :nuget_max_file_size, type: Integer, desc: 'Maximum NuGet package file size in bytes' optional :pypi_max_file_size, type: Integer, desc: 'Maximum PyPI package file size in bytes' optional :terraform_module_max_file_size, type: Integer, desc: 'Maximum Terraform Module package file size in bytes' + optional :storage_size_limit, type: Integer, desc: 'Maximum storage size for the root namespace in megabytes' end put "application/plan_limits" do params = declared_params(include_missing: false) diff --git a/lib/api/entities/plan_limit.rb b/lib/api/entities/plan_limit.rb index 33d59a4207c..94e50f19b35 100644 --- a/lib/api/entities/plan_limit.rb +++ b/lib/api/entities/plan_limit.rb @@ -19,6 +19,7 @@ module API expose :nuget_max_file_size expose :pypi_max_file_size expose :terraform_module_max_file_size + expose :storage_size_limit end end end |