diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-09 12:09:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-09 12:09:19 +0300 |
commit | e7462f7b49a60b2ee7be14682c23190f7f7c5ba7 (patch) | |
tree | 3437f7c7c7931ff2e017de00e69dea10f3d00b57 /db | |
parent | 43d38aaae05e2ac7e84c035c50844e084c3e54d3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20210106225424_add_keep_latest_artifacts_to_application_settings.rb | 11 | ||||
-rw-r--r-- | db/schema_migrations/20210106225424 | 1 | ||||
-rw-r--r-- | db/structure.sql | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/db/migrate/20210106225424_add_keep_latest_artifacts_to_application_settings.rb b/db/migrate/20210106225424_add_keep_latest_artifacts_to_application_settings.rb new file mode 100644 index 00000000000..884159ddedb --- /dev/null +++ b/db/migrate/20210106225424_add_keep_latest_artifacts_to_application_settings.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class AddKeepLatestArtifactsToApplicationSettings < ActiveRecord::Migration[6.0] + DOWNTIME = false + + def change + # This is named keep_latest_artifact for consistency with the project level setting but + # turning it on keeps all (multiple) artifacts on the latest pipeline per ref + add_column :application_settings, :keep_latest_artifact, :boolean, default: true, null: false + end +end diff --git a/db/schema_migrations/20210106225424 b/db/schema_migrations/20210106225424 new file mode 100644 index 00000000000..84878ee30f4 --- /dev/null +++ b/db/schema_migrations/20210106225424 @@ -0,0 +1 @@ +a0561e52982756aded22563e833ab8005b4f45b84c81e872dd8c7188aeb84434
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 7400b023fd5..f0e04477052 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -9412,6 +9412,7 @@ CREATE TABLE application_settings ( 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, 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)), |