Merge branch 'mk-fix-ee-only-current-application-settings' into 'master'

Fix undefined method errors

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

lib/system_check/app/elasticsearch_check.rb

@@ -8,13 +8,13 @@ module SystemCheck
 
       def self.current_version
         @current_version ||= begin
-          client = Gitlab::Elastic::Client.build(current_application_settings.elasticsearch_config)
+          client = Gitlab::Elastic::Client.build(Gitlab::CurrentSettings.current_application_settings.elasticsearch_config)
           Gitlab::VersionInfo.parse(client.info['version']['number'])
         end
       end
 
       def skip?
-        !current_application_settings.elasticsearch_indexing?
+        !Gitlab::CurrentSettings.current_application_settings.elasticsearch_indexing?
       end
 
       def check?

lib/tasks/gitlab/shell.rake

@@ -132,7 +132,7 @@ namespace :gitlab do
   end
 
   def ensure_write_to_authorized_keys_is_enabled
-    return if current_application_settings.authorized_keys_enabled
+    return if Gitlab::CurrentSettings.current_application_settings.authorized_keys_enabled
 
     puts authorized_keys_is_disabled_warning