diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-09 01:26:43 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-09 01:26:43 +0300 |
| commit | 08c9cb4cabab648d90e6fcf055f1143fbbc994e8 (patch) | |
| tree | cf02a2ba1eb4fe1c011ef2c2b37e884c13efa900 /app | |
| parent | 939c046a9872c1d7c38d73dc08860681ecebd1f1 (diff) | |
Finally fix stuff related to dynamic config
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 8 | ||||
| -rw-r--r-- | app/helpers/profile_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/admin/dashboard/index.html.haml | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 16db33efd33..04299316102 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -1,10 +1,14 @@ module ApplicationSettingsHelper + def gravatar_enabled? + current_application_settings.gravatar_enabled? + end + def signup_enabled? - current_application_settings.signup_enabled + current_application_settings.signup_enabled? end def signin_enabled? - current_application_settings.signin_enabled + current_application_settings.signin_enabled? end def extra_sign_in_text diff --git a/app/helpers/profile_helper.rb b/app/helpers/profile_helper.rb index 6480fd3886f..9e37e44732a 100644 --- a/app/helpers/profile_helper.rb +++ b/app/helpers/profile_helper.rb @@ -14,6 +14,6 @@ module ProfileHelper end def show_profile_remove_tab? - gitlab_config.signup_enabled + signup_enabled? end end diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 7427cea7e8b..c6badeb4bd9 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -104,7 +104,7 @@ %p Sign up %span.light.pull-right - = boolean_to_icon gitlab_config.signup_enabled + = boolean_to_icon signup_enabled? %p LDAP %span.light.pull-right @@ -112,7 +112,7 @@ %p Gravatar %span.light.pull-right - = boolean_to_icon Gitlab.config.gravatar.enabled + = boolean_to_icon gravatar_enabled? %p OmniAuth %span.light.pull-right |