diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-17 06:08:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-17 06:08:59 +0300 |
| commit | 38c3d3255398d615cf93867cb82902c3d2cb65a5 (patch) | |
| tree | 5cc74f663afedac5125a59f81e2a4a571c61cb49 /db | |
| parent | 668e319631855d6d9396a203ded1fa5bcb986f1f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20201120092000_add_kroki_formats_to_application_settings_table.rb | 11 | ||||
| -rw-r--r-- | db/schema_migrations/20201120092000 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/db/migrate/20201120092000_add_kroki_formats_to_application_settings_table.rb b/db/migrate/20201120092000_add_kroki_formats_to_application_settings_table.rb new file mode 100644 index 00000000000..a059099dbc4 --- /dev/null +++ b/db/migrate/20201120092000_add_kroki_formats_to_application_settings_table.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class AddKrokiFormatsToApplicationSettingsTable < ActiveRecord::Migration[6.0] + DOWNTIME = false + + def change + change_table :application_settings do |t| + t.jsonb :kroki_formats, null: false, default: {} + end + end +end diff --git a/db/schema_migrations/20201120092000 b/db/schema_migrations/20201120092000 new file mode 100644 index 00000000000..eaa6c37cff2 --- /dev/null +++ b/db/schema_migrations/20201120092000 @@ -0,0 +1 @@ +c8f837a5fe7a1959af41f19f93b6dd96d8907a476626f124876ee8b10b120b71
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index e8d94c87b7c..d582c343e73 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -9398,6 +9398,7 @@ CREATE TABLE application_settings ( keep_latest_artifact boolean DEFAULT true NOT NULL, notes_create_limit integer DEFAULT 300 NOT NULL, notes_create_limit_allowlist text[] DEFAULT '{}'::text[] NOT NULL, + kroki_formats jsonb DEFAULT '{}'::jsonb 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)), |