Commit b68227ad authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch '231177-enforce-storage-limit-app-setting' into 'master'

Enforce namespace storage limit via app setting

See merge request gitlab-org/gitlab!38094
parents 179f44a6 d33fb8ac
---
title: Enforce namespace storage limit via app setting
merge_request: 38094
author:
type: changed
# frozen_string_literal: true
class AddEnforceNamespaceStorageLimitToApplicationSettings < ActiveRecord::Migration[6.0]
DOWNTIME = false
def change
add_column :application_settings, :enforce_namespace_storage_limit, :boolean, default: false, null: false
end
end
a3a6d4e488c9979efd61890a15fdfe4ccea044a0b030b392ad39885cc807f22d
\ No newline at end of file
...@@ -9248,6 +9248,7 @@ CREATE TABLE public.application_settings ( ...@@ -9248,6 +9248,7 @@ CREATE TABLE public.application_settings (
maintenance_mode_message text, maintenance_mode_message text,
wiki_page_max_content_bytes bigint DEFAULT 52428800 NOT NULL, wiki_page_max_content_bytes bigint DEFAULT 52428800 NOT NULL,
elasticsearch_indexed_file_size_limit_kb integer DEFAULT 1024 NOT NULL, elasticsearch_indexed_file_size_limit_kb integer DEFAULT 1024 NOT NULL,
enforce_namespace_storage_limit boolean DEFAULT false NOT NULL,
CONSTRAINT check_51700b31b5 CHECK ((char_length(default_branch_name) <= 255)), CONSTRAINT check_51700b31b5 CHECK ((char_length(default_branch_name) <= 255)),
CONSTRAINT check_9c6c447a13 CHECK ((char_length(maintenance_mode_message) <= 255)), CONSTRAINT check_9c6c447a13 CHECK ((char_length(maintenance_mode_message) <= 255)),
CONSTRAINT check_d03919528d CHECK ((char_length(container_registry_vendor) <= 255)), CONSTRAINT check_d03919528d CHECK ((char_length(container_registry_vendor) <= 255)),
......
...@@ -251,6 +251,7 @@ are listed in the descriptions of the relevant settings. ...@@ -251,6 +251,7 @@ are listed in the descriptions of the relevant settings.
| `email_additional_text` | string | no | **(PREMIUM)** Additional text added to the bottom of every email for legal/auditing/compliance reasons | | `email_additional_text` | string | no | **(PREMIUM)** Additional text added to the bottom of every email for legal/auditing/compliance reasons |
| `email_author_in_body` | boolean | no | Some email servers do not support overriding the email sender name. Enable this option to include the name of the author of the issue, merge request or comment in the email body instead. | | `email_author_in_body` | boolean | no | Some email servers do not support overriding the email sender name. Enable this option to include the name of the author of the issue, merge request or comment in the email body instead. |
| `enabled_git_access_protocol` | string | no | Enabled protocols for Git access. Allowed values are: `ssh`, `http`, and `nil` to allow both protocols. | | `enabled_git_access_protocol` | string | no | Enabled protocols for Git access. Allowed values are: `ssh`, `http`, and `nil` to allow both protocols. |
| `enforce_namespace_storage_limit` | boolean | no | Enabling this permits enforcement of namespace storage limits. |
| `enforce_terms` | boolean | no | (**If enabled, requires:** `terms`) Enforce application ToS to all users. | | `enforce_terms` | boolean | no | (**If enabled, requires:** `terms`) Enforce application ToS to all users. |
| `external_auth_client_cert` | string | no | (**If enabled, requires:** `external_auth_client_key`) The certificate to use to authenticate with the external authorization service | | `external_auth_client_cert` | string | no | (**If enabled, requires:** `external_auth_client_key`) The certificate to use to authenticate with the external authorization service |
| `external_auth_client_key_pass` | string | no | Passphrase to use for the private key when authenticating with the external service this is encrypted when stored | | `external_auth_client_key_pass` | string | no | Passphrase to use for the private key when authenticating with the external service this is encrypted when stored |
......
...@@ -38,6 +38,7 @@ module EE ...@@ -38,6 +38,7 @@ module EE
:elasticsearch_limit_indexing, :elasticsearch_limit_indexing,
:elasticsearch_namespace_ids, :elasticsearch_namespace_ids,
:elasticsearch_project_ids, :elasticsearch_project_ids,
:enforce_namespace_storage_limit,
:geo_status_timeout, :geo_status_timeout,
:geo_node_allowed_ips, :geo_node_allowed_ips,
:help_text, :help_text,
......
...@@ -112,6 +112,7 @@ module EE ...@@ -112,6 +112,7 @@ module EE
elasticsearch_max_bulk_concurrency: 10, elasticsearch_max_bulk_concurrency: 10,
elasticsearch_url: ENV['ELASTIC_URL'] || 'http://localhost:9200', elasticsearch_url: ENV['ELASTIC_URL'] || 'http://localhost:9200',
email_additional_text: nil, email_additional_text: nil,
enforce_namespace_storage_limit: false,
lock_memberships_to_ldap: false, lock_memberships_to_ldap: false,
max_personal_access_token_lifetime: nil, max_personal_access_token_lifetime: nil,
enforce_pat_expiration: true, enforce_pat_expiration: true,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment