Merge branch 'bw-add-geo-console-message' into 'master'

Add Geo information to console message

See merge request gitlab-org/gitlab-ee!5588

config/initializers/console_message.rb

@@ -6,5 +6,14 @@ if defined?(Rails::Console)
   puts " Gitlab:".ljust(justify) + "#{Gitlab::VERSION} (#{Gitlab::REVISION})"
   puts " Gitlab Shell:".ljust(justify) + Gitlab::Shell.new.version
   puts " #{Gitlab::Database.adapter_name}:".ljust(justify) + Gitlab::Database.version
+
+  # EE-specific start
+  if Gitlab::Geo.enabled?
+    puts " Geo enabled:".ljust(justify) + 'yes'
+    puts " Geo server:".ljust(justify) + (Gitlab::Geo.primary? ? 'primary' : 'secondary')
+  end
+
+  # EE specific end
+
   puts "-------------------------------------------------------------------------------------"
 end

ee/changelogs/unreleased/bw-add-geo-console-message.yml

+---
+title: Add Geo information to console message
+merge_request: 5588
+author:
+type: changed