diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-10 00:09:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-10 00:09:19 +0300 |
| commit | b5944525b015e4efb4cd2c1d09ec37566d7691a0 (patch) | |
| tree | 23134355a45b69298483e6c08b65ef6b23b8bd26 /db | |
| parent | 16cfd85bcf0046ae97d7ea84dae7eea3eafafe99 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20210208161207_add_notes_create_limit_to_application_settings.rb | 9 | ||||
| -rw-r--r-- | db/schema_migrations/20210208161207 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/db/migrate/20210208161207_add_notes_create_limit_to_application_settings.rb b/db/migrate/20210208161207_add_notes_create_limit_to_application_settings.rb new file mode 100644 index 00000000000..4468da77e6c --- /dev/null +++ b/db/migrate/20210208161207_add_notes_create_limit_to_application_settings.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddNotesCreateLimitToApplicationSettings < ActiveRecord::Migration[6.0] + DOWNTIME = false + + def change + add_column :application_settings, :notes_create_limit, :integer, default: 300, null: false + end +end diff --git a/db/schema_migrations/20210208161207 b/db/schema_migrations/20210208161207 new file mode 100644 index 00000000000..7064a636822 --- /dev/null +++ b/db/schema_migrations/20210208161207 @@ -0,0 +1 @@ +818fcf0f0fec9d2833b091ef380005a2d485486522fb63e2a7b2fd01dbf1ff79
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index f0e04477052..8c49262f1e3 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -9413,6 +9413,7 @@ CREATE TABLE application_settings ( git_two_factor_session_expiry integer DEFAULT 15 NOT NULL, asset_proxy_allowlist text, keep_latest_artifact boolean DEFAULT true NOT NULL, + notes_create_limit integer DEFAULT 300 NOT NULL, CONSTRAINT app_settings_container_reg_cleanup_tags_max_list_size_positive CHECK ((container_registry_cleanup_tags_service_max_list_size >= 0)), CONSTRAINT app_settings_registry_exp_policies_worker_capacity_positive CHECK ((container_registry_expiration_policies_worker_capacity >= 0)), CONSTRAINT check_17d9558205 CHECK ((char_length((kroki_url)::text) <= 1024)), |