diff options
author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2021-10-28 15:06:54 +0300 |
---|---|---|
committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2021-10-28 15:06:54 +0300 |
commit | 305ea394efd2d5afe16234406dede486d9ca37af (patch) | |
tree | 92b38d477de28ee6ee1e4319d1e8e0f04365b749 /db | |
parent | 51b27ab58055b65e14e68b19604e4823389adb73 (diff) | |
parent | 1a23d731c9f1149b8be1f16a1d781490df288f18 (diff) |
Merge remote-tracking branch 'dev/14-4-stable' into 14-4-stable
Diffstat (limited to 'db')
-rw-r--r-- | db/fixtures/production/002_admin.rb | 2 | ||||
-rw-r--r-- | db/migrate/20210929144453_add_warn_about_potentially_unwanted_characters_to_project_settings.rb | 16 | ||||
-rw-r--r-- | db/schema_migrations/20210929144453 | 1 | ||||
-rw-r--r-- | db/structure.sql | 1 |
4 files changed, 19 insertions, 1 deletions
diff --git a/db/fixtures/production/002_admin.rb b/db/fixtures/production/002_admin.rb index b6a6da3a188..b4710bc3e97 100644 --- a/db/fixtures/production/002_admin.rb +++ b/db/fixtures/production/002_admin.rb @@ -26,7 +26,7 @@ if user.persisted? if ::Settings.gitlab['display_initial_root_password'] puts "password: #{user_args[:password]}".color(:green) else - puts "password: *** - You opted not to display initial root password to STDOUT." + puts "password: ******".color(:green) end else puts "password: You'll be prompted to create one on your first visit.".color(:green) diff --git a/db/migrate/20210929144453_add_warn_about_potentially_unwanted_characters_to_project_settings.rb b/db/migrate/20210929144453_add_warn_about_potentially_unwanted_characters_to_project_settings.rb new file mode 100644 index 00000000000..166afa13371 --- /dev/null +++ b/db/migrate/20210929144453_add_warn_about_potentially_unwanted_characters_to_project_settings.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +# See https://docs.gitlab.com/ee/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class AddWarnAboutPotentiallyUnwantedCharactersToProjectSettings < Gitlab::Database::Migration[1.0] + enable_lock_retries! + + def up + add_column :project_settings, :warn_about_potentially_unwanted_characters, :boolean, null: false, default: true + end + + def down + remove_column :project_settings, :warn_about_potentially_unwanted_characters + end +end diff --git a/db/schema_migrations/20210929144453 b/db/schema_migrations/20210929144453 new file mode 100644 index 00000000000..753ea50c272 --- /dev/null +++ b/db/schema_migrations/20210929144453 @@ -0,0 +1 @@ +0f808c27d19e6a38d4aa31f2dd820fe226681af84e05c4af47213409b2043e5a
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index d3882446f57..c73ade92f80 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -18156,6 +18156,7 @@ CREATE TABLE project_settings ( cve_id_request_enabled boolean DEFAULT true NOT NULL, mr_default_target_self boolean DEFAULT false NOT NULL, previous_default_branch text, + warn_about_potentially_unwanted_characters boolean DEFAULT true NOT NULL, CONSTRAINT check_3a03e7557a CHECK ((char_length(previous_default_branch) <= 4096)), CONSTRAINT check_bde223416c CHECK ((show_default_award_emojis IS NOT NULL)) ); |