diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-05 23:11:43 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-05 23:11:43 +0000 |
commit | 13d327df4f3c52505bf8ec1144f2dedb6a351ad6 (patch) | |
tree | 546e42fe159cde302b5e4d0b923d399e79bfbf71 /db | |
parent | 9a70fcd2e277721bbe7b9a0c92ed925ddea201b6 (diff) | |
download | gitlab-ce-13d327df4f3c52505bf8ec1144f2dedb6a351ad6.tar.gz |
Add latest changes from gitlab-org/gitlab@13-9-stable-ee
Diffstat (limited to 'db')
5 files changed, 45 insertions, 1 deletions
diff --git a/db/migrate/20210301200601_rename_asset_proxy_allowlist_on_application_settings.rb b/db/migrate/20210301200601_rename_asset_proxy_allowlist_on_application_settings.rb new file mode 100644 index 00000000000..8a9acd8b86e --- /dev/null +++ b/db/migrate/20210301200601_rename_asset_proxy_allowlist_on_application_settings.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +class RenameAssetProxyAllowlistOnApplicationSettings < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers::V2 + + DOWNTIME = false + + disable_ddl_transaction! + + def up + rename_column_concurrently :application_settings, + :asset_proxy_allowlist, + :asset_proxy_whitelist + end + + def down + undo_rename_column_concurrently :application_settings, + :asset_proxy_allowlist, + :asset_proxy_whitelist + end +end diff --git a/db/post_migrate/20210301200959_clean_up_asset_proxy_allowlist_rename_on_application_settings.rb b/db/post_migrate/20210301200959_clean_up_asset_proxy_allowlist_rename_on_application_settings.rb new file mode 100644 index 00000000000..d0b372b84f0 --- /dev/null +++ b/db/post_migrate/20210301200959_clean_up_asset_proxy_allowlist_rename_on_application_settings.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +class CleanUpAssetProxyAllowlistRenameOnApplicationSettings < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers::V2 + + DOWNTIME = false + + disable_ddl_transaction! + + def up + cleanup_concurrent_column_rename :application_settings, + :asset_proxy_allowlist, + :asset_proxy_whitelist + end + + def down + undo_cleanup_concurrent_column_rename :application_settings, + :asset_proxy_allowlist, + :asset_proxy_whitelist + end +end diff --git a/db/schema_migrations/20210301200601 b/db/schema_migrations/20210301200601 new file mode 100644 index 00000000000..13907f9de8b --- /dev/null +++ b/db/schema_migrations/20210301200601 @@ -0,0 +1 @@ +21ae7ea7cbf1d34c7b9dc300a641eaf975ed1e33f5bc519494cd37c4a661bec8
\ No newline at end of file diff --git a/db/schema_migrations/20210301200959 b/db/schema_migrations/20210301200959 new file mode 100644 index 00000000000..8c5efabd76d --- /dev/null +++ b/db/schema_migrations/20210301200959 @@ -0,0 +1 @@ +28b90c9b7c2e4f2e2b12088f5aee85c16dfb567f89ed6a8e771f2c5d91c818d9
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 97a2850fd5c..c6b3b7ea997 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -9394,11 +9394,11 @@ CREATE TABLE application_settings ( container_registry_cleanup_tags_service_max_list_size integer DEFAULT 200 NOT NULL, enforce_ssh_key_expiration boolean DEFAULT false NOT NULL, 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, notes_create_limit_allowlist text[] DEFAULT '{}'::text[] NOT NULL, kroki_formats jsonb DEFAULT '{}'::jsonb NOT NULL, + asset_proxy_whitelist text, 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)), |