diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-07 06:09:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-07 06:09:49 +0300 |
| commit | fc5ff4728b3937c8a505aa06f9cfe5b2da672b03 (patch) | |
| tree | 2f2d7036d8b76b5a62d47b24c1db006594df0ca6 /db | |
| parent | d5f6f9fbcdeb231e03c24b56aaf736580ac40eb2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20201126172030_add_feed_token_off_to_settings.rb | 9 | ||||
| -rw-r--r-- | db/schema_migrations/20201126172030 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/db/migrate/20201126172030_add_feed_token_off_to_settings.rb b/db/migrate/20201126172030_add_feed_token_off_to_settings.rb new file mode 100644 index 00000000000..04e05c9bd43 --- /dev/null +++ b/db/migrate/20201126172030_add_feed_token_off_to_settings.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddFeedTokenOffToSettings < ActiveRecord::Migration[6.0] + DOWNTIME = false + + def change + add_column :application_settings, :disable_feed_token, :boolean, null: false, default: false + end +end diff --git a/db/schema_migrations/20201126172030 b/db/schema_migrations/20201126172030 new file mode 100644 index 00000000000..789a914af41 --- /dev/null +++ b/db/schema_migrations/20201126172030 @@ -0,0 +1 @@ +65dcc2a53d48acc83dbfc5276e8cfc1eee5f20ffea8355d86df1f2d5b329061b
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 867b65ebdab..fdd3bcc5789 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -9371,6 +9371,7 @@ CREATE TABLE application_settings ( encrypted_cloud_license_auth_token_iv text, secret_detection_revocation_token_types_url text, cloud_license_enabled boolean DEFAULT false NOT NULL, + disable_feed_token boolean DEFAULT false NOT NULL, 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)), CONSTRAINT check_2dba05b802 CHECK ((char_length(gitpod_url) <= 255)), |