summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorAndrei Vukolov <andrei.vukolov@gmail.com>2018-06-25 17:44:03 +0000
committerAndrei Vukolov <andrei.vukolov@gmail.com>2018-06-25 17:44:03 +0000
commit6d2b934d449340e82d4f7d75ccd0e0d166972c57 (patch)
treea8caada59b3bc631f5858ee6581735aee2fd35b3 /app/controllers/admin
parent1d116f3ecdf64d82178e614594c6929c0e07d928 (diff)
downloadgitlab-ce-6d2b934d449340e82d4f7d75ccd0e0d166972c57.tar.gz
Fix initial settings loading at the first run of GitLab installed from source
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/application_settings_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index ef84d664075..9723e400574 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -52,7 +52,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
private
def set_application_setting
- @application_setting = Gitlab::CurrentSettings#current_application_settings
+ @application_setting = Gitlab::CurrentSettings.current_application_settings
end
def application_setting_params