Merge branch 'feature/improve-gitlab-env-info' into 'master'

[EE] Improve gitlab:env:info

Added additional information (which we already display in `Admin > Dashboard`) to help troubleshooting issues in Geo (#76).

See merge request !459

lib/tasks/gitlab/info.rake

@@ -28,7 +28,8 @@ namespace :gitlab do
 
 
       # check database adapter
-      database_adapter = ActiveRecord::Base.connection.adapter_name.downcase
+      database_adapter = Gitlab::Database.adapter_name
+      database_version = Gitlab::Database.version
 
       project = Group.new(path: "some-group").projects.build(path: "some-project")
       # construct clone URLs
@@ -44,9 +45,13 @@ namespace :gitlab do
       puts "Revision:\t#{Gitlab::REVISION}"
       puts "Directory:\t#{Rails.root}"
       puts "DB Adapter:\t#{database_adapter}"
+      puts "DB Version:\t#{database_version}"
       puts "URL:\t\t#{Gitlab.config.gitlab.url}"
       puts "HTTP Clone URL:\t#{http_clone_url}"
       puts "SSH Clone URL:\t#{ssh_clone_url}"
+      puts "Elasticsearch:\t#{Gitlab.config.elasticsearch.enabled ? "yes".color(:green) : "no"}"
+      puts "Geo:\t\t#{Gitlab::Geo.enabled? ? "yes".color(:green) : "no"}"
+      puts "Geo node:\t#{Gitlab::Geo.current_node.primary ? "Primary" : "Secondary"}" if Gitlab::Geo.enabled?
       puts "Using LDAP:\t#{Gitlab.config.ldap.enabled ? "yes".color(:green) : "no"}"
       puts "Using Omniauth:\t#{Gitlab.config.omniauth.enabled ? "yes".color(:green) : "no"}"
       puts "Omniauth Providers: #{omniauth_providers.join(', ')}" if Gitlab.config.omniauth.enabled