From 46b10c0fc884400941c17e2777b242ac54d111e5 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 29 Jan 2020 09:08:49 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/initializers/console_message.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'config/initializers') 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 -- cgit v1.2.3