diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /db/fixtures | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'db/fixtures')
-rw-r--r-- | db/fixtures/production/002_admin.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/db/fixtures/production/002_admin.rb b/db/fixtures/production/002_admin.rb index 1c7c89f7bbd..b6a6da3a188 100644 --- a/db/fixtures/production/002_admin.rb +++ b/db/fixtures/production/002_admin.rb @@ -23,7 +23,11 @@ if user.persisted? puts "login: root".color(:green) if user_args.key?(:password) - puts "password: #{user_args[:password]}".color(:green) + 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." + end else puts "password: You'll be prompted to create one on your first visit.".color(:green) end |