Add latest changes from gitlab-org/gitlab@master

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