Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 5 deletions

diff --git a/config/initializers/console_message.rb b/config/initializers/console_message.rb
index 04c109aa844..74d98dec79a 100644
--- a/config/initializers/console_message.rb
+++ b/config/initializers/console_message.rb
@@ -6,12 +6,15 @@ if defined?(Rails::Console)
   puts '-' * 80
   puts " GitLab:".ljust(justify) + "#{Gitlab::VERSION} (#{Gitlab.revision})"
   puts " GitLab Shell:".ljust(justify) + "#{Gitlab::VersionInfo.parse(Gitlab::Shell.new.version)}"
-  puts " #{Gitlab::Database.human_adapter_name}:".ljust(justify) + Gitlab::Database.version
 
-  Gitlab.ee do
-    if Gitlab::Geo.enabled?
-      puts " Geo enabled:".ljust(justify) + 'yes'
-      puts " Geo server:".ljust(justify) + EE::GeoHelper.current_node_human_status
+  if Gitlab::Database.exists?
+    puts " #{Gitlab::Database.human_adapter_name}:".ljust(justify) + Gitlab::Database.version
+
+    Gitlab.ee do
+      if Gitlab::Geo.connected? && Gitlab::Geo.enabled?
+        puts " Geo enabled:".ljust(justify) + 'yes'
+        puts " Geo server:".ljust(justify) + EE::GeoHelper.current_node_human_status
+      end
     end
   end