diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-14 11:49:36 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-14 11:49:36 +0300 |
| commit | 1afdbe320e60aa227dfd75ae1f1f128106660c8a (patch) | |
| tree | 38e91b764c45b2f0074829560325d0f4b2b4ae39 /app/helpers/application_settings_helper.rb | |
| parent | febd3884a293859a63d2a7ae83b969fc33448f26 (diff) | |
| parent | 672a68d3724bcae676d18244c85566e7d664a169 (diff) | |
Merge branch 'fixes-for-internal-auth-disabled' into 'master'
Fixes needed when GitLab sign-in is not enabled
See merge request !12491
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 45b10f61f33..29b88c60dab 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -1,7 +1,7 @@ module ApplicationSettingsHelper delegate :gravatar_enabled?, :signup_enabled?, - :signin_enabled?, + :password_authentication_enabled?, :akismet_enabled?, :koding_enabled?, to: :current_application_settings |