diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2015-12-28 18:21:34 -0200 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2015-12-28 18:50:29 -0200 |
| commit | a3469d914aaf28a1184247cbe72e5197ce7ca006 (patch) | |
| tree | 8bc68cf4adf391142bcfa8bf2cc7a3d7a572ead2 /config/initializers/1_settings.rb | |
| parent | af00558d38806eda2fa70c8fdc34be98fced44a4 (diff) | |
| download | gitlab-ce-a3469d914aaf28a1184247cbe72e5197ce7ca006.tar.gz | |
reCAPTCHA is configurable through Admin Settings, no reload needed.
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 045bab739ea..dea59f4fec8 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -131,12 +131,6 @@ Settings.omniauth.cas3['session_duration'] ||= 8.hours Settings.omniauth['session_tickets'] ||= Settingslogic.new({}) Settings.omniauth.session_tickets['cas3'] = 'ticket' -# ReCAPTCHA settings -Settings['recaptcha'] ||= Settingslogic.new({}) -Settings.recaptcha['enabled'] = false if Settings.recaptcha['enabled'].nil? -Settings.recaptcha['public_key'] ||= Settings.recaptcha['public_key'] -Settings.recaptcha['private_key'] ||= Settings.recaptcha['private_key'] - Settings['shared'] ||= Settingslogic.new({}) Settings.shared['path'] = File.expand_path(Settings.shared['path'] || "shared", Rails.root) |