summaryrefslogtreecommitdiff
path: root/app/controllers/registrations_controller.rb
diff options
context:
space:
mode:
authorGabriel Mazetto <gabriel@gitlab.com>2015-12-28 18:21:34 -0200
committerGabriel Mazetto <gabriel@gitlab.com>2015-12-28 18:50:29 -0200
commita3469d914aaf28a1184247cbe72e5197ce7ca006 (patch)
tree8bc68cf4adf391142bcfa8bf2cc7a3d7a572ead2 /app/controllers/registrations_controller.rb
parentaf00558d38806eda2fa70c8fdc34be98fced44a4 (diff)
downloadgitlab-ce-a3469d914aaf28a1184247cbe72e5197ce7ca006.tar.gz
reCAPTCHA is configurable through Admin Settings, no reload needed.
Diffstat (limited to 'app/controllers/registrations_controller.rb')
-rw-r--r--app/controllers/registrations_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index ee1006dea49..485aaf45b01 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -7,7 +7,7 @@ class RegistrationsController < Devise::RegistrationsController
end
def create
- if !Gitlab.config.recaptcha.enabled || verify_recaptcha
+ if Gitlab::Recaptcha.load_configurations! && verify_recaptcha
super
else
flash[:alert] = "There was an error with the reCAPTCHA code below. Please re-enter the code."