summaryrefslogtreecommitdiff
path: root/config/initializers/1_settings.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-12-27 09:03:06 -0800
committerStan Hu <stanhu@gmail.com>2015-12-27 09:04:11 -0800
commit9f7d379c2a018c86671bfc157fe1f0cf4e31e25e (patch)
tree3b0a9032c050138c3ad9a681f790da9fae65ee51 /config/initializers/1_settings.rb
parenta52746649d1db4f52ae4e989dcf654ef4af57905 (diff)
downloadgitlab-ce-9f7d379c2a018c86671bfc157fe1f0cf4e31e25e.tar.gz
Add support for Google reCAPTCHA in user registration to prevent spammers
Diffstat (limited to 'config/initializers/1_settings.rb')
-rw-r--r--config/initializers/1_settings.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 816cb0c02a9..0dc4838fec1 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -131,6 +131,13 @@ 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)