Commit 36f8dbd3 authored by Sean McGivern's avatar Sean McGivern

Merge branch '1164-fix-rake-gitlab-env-info' into 'master'

Fix rake gitlab:env:info elasticsearch datum

Closes #1164

See merge request !1422
parents 887ef155 5e206bff
---
title: Fix rake gitlab:env:info elasticsearch datum
merge_request: 1422
author:
......@@ -28,7 +28,7 @@ namespace :gitlab do
check_ruby_version
check_git_version
check_active_users
check_elasticsearch if ApplicationSetting.current.elasticsearch_indexing?
check_elasticsearch if current_application_settings.elasticsearch_indexing?
finished_checking "GitLab"
end
......@@ -1076,7 +1076,7 @@ namespace :gitlab do
end
def check_elasticsearch
client = Gitlab::Elastic::Client.build(ApplicationSetting.current.elasticsearch_config)
client = Gitlab::Elastic::Client.build(current_application_settings.elasticsearch_config)
print "Elasticsearch version 5.1.x? ... "
......
......@@ -63,7 +63,7 @@ namespace :gitlab do
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 "Elasticsearch:\t#{current_application_settings.elasticsearch_indexing? ? "yes".color(:green) : "no"}"
puts "Geo:\t\t#{Gitlab::Geo.enabled? ? "yes".color(:green) : "no"}"
puts "Geo node:\t#{geo_node_type}" if Gitlab::Geo.enabled?
puts "Using LDAP:\t#{Gitlab.config.ldap.enabled ? "yes".color(:green) : "no"}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment