Commit 30209fc4 authored by Sean McGivern's avatar Sean McGivern

Make Gitlab::CurrentSettings available when getting settings

parent fbdbc0ba
module Elastic
module ApplicationSearch
extend ActiveSupport::Concern
extend Gitlab::CurrentSettings
included do
include Elasticsearch::Model
extend Gitlab::CurrentSettings
index_name [Rails.application.class.parent_name.downcase, Rails.env].join('-')
......
......@@ -442,9 +442,9 @@ module Gitlab
def authorized_keys_enabled?
# Return true if nil to ensure the authorized_keys methods work while
# fixing the authorized_keys file during migration.
return true if current_application_settings.authorized_keys_enabled.nil?
return true if Gitlab::CurrentSettings.current_application_settings.authorized_keys_enabled.nil?
current_application_settings.authorized_keys_enabled
Gitlab::CurrentSettings.current_application_settings.authorized_keys_enabled
end
private
......
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