Commit 01319e59 authored by Sean McGivern's avatar Sean McGivern Committed by James Edwards-Jones

Make Gitlab::CurrentSettings available when getting settings

parent d2f4e8f9
...@@ -391,6 +391,14 @@ module Gitlab ...@@ -391,6 +391,14 @@ module Gitlab
File.join(gitlab_shell_path, 'bin', 'gitlab-keys') File.join(gitlab_shell_path, 'bin', 'gitlab-keys')
end end
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 Gitlab::CurrentSettings.current_application_settings.authorized_keys_enabled.nil?
Gitlab::CurrentSettings.current_application_settings.authorized_keys_enabled
end
private private
def gitlab_projects(shard_path, disk_path) def gitlab_projects(shard_path, disk_path)
...@@ -468,13 +476,5 @@ module Gitlab ...@@ -468,13 +476,5 @@ module Gitlab
# need to do the same here... # need to do the same here...
raise Error, e raise Error, e
end end
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?
current_application_settings.authorized_keys_enabled
end
end end
end end
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