Merge branch 'nicolasdular/storage-limit-settings' into 'master'

Namespace storage limit settings

See merge request gitlab-org/gitlab!27894

app/views/admin/application_settings/_account_and_limit.html.haml

@@ -7,6 +7,15 @@
         = f.check_box :gravatar_enabled, class: 'form-check-input'
         = f.label :gravatar_enabled, class: 'form-check-label' do
           = _('Gravatar enabled')
+
+    .form-group
+      = f.label :namespace_storage_size_limit, class: 'label-bold' do
+        = _('Maximum namespace storage (MB)')
+      = f.number_field :namespace_storage_size_limit, class: 'form-control', min: 0
+      %span.form-text.text-muted
+        = _('Includes repository storage, wiki storage, LFS objects, build artifacts and packages. 0 for unlimited.')
+        = link_to _('More information'), help_page_path('user/admin_area/settings/account_and_limit_settings', anchor: 'maximum-namespace-storage-size'), target: '_blank'
+
     .form-group
       = f.label :default_projects_limit, _('Default projects limit'), class: 'label-bold'
       = f.number_field :default_projects_limit, class: 'form-control', title: _('Maximum number of projects.'), data: { toggle: 'tooltip', container: 'body' }

changelogs/unreleased/nicolasdular-storage-limit-settings.yml

+---
+title: Add namespace storage size limit setting
+merge_request:
+author:
+type: added

doc/user/admin_area/settings/account_and_limit_settings.md

@@ -15,6 +15,19 @@ If you choose a size larger than what is currently configured for the web server
 you will likely get errors. See the [troubleshooting section](#troubleshooting) for more
 details.
 
+## Maximum namespace storage size
+
+This sets a maximum size limit on each namespace. The following are included in the namespace size:
+
+- repository
+- wiki
+- LFS objects
+- build artifacts
+- packages
+
+NOTE: **Note:**
+This limit is not currently enforced but will be in a future release.
+
 ## Repository size limit **(STARTER ONLY)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/740) in [GitLab Enterprise Edition 8.12](https://about.gitlab.com/releases/2016/09/22/gitlab-8-12-released/#limit-project-size-ee).

locale/gitlab.pot

@@ -10945,6 +10945,9 @@ msgstr ""
 msgid "Includes an MVC structure, mvnw and pom.xml to help you get started."
 msgstr ""
 
+msgid "Includes repository storage, wiki storage, LFS objects, build artifacts and packages. 0 for unlimited."
+msgstr ""
+
 msgid "Incoming email"
 msgstr ""
 
@@ -12399,6 +12402,9 @@ msgstr ""
 msgid "Maximum lifetime allowable for Personal Access Tokens is active, your expire date must be set before %{maximum_allowable_date}."
 msgstr ""
 
+msgid "Maximum namespace storage (MB)"
+msgstr ""
+
 msgid "Maximum number of %{name} (%{count}) exceeded"
 msgstr ""