summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-12-28 16:59:59 -0800
committerStan Hu <stanhu@gmail.com>2015-12-28 16:59:59 -0800
commite619d0b615a394a08ca1d0be59f0028c8e390b88 (patch)
tree49042c9defa553643aa7fb46ad3fbaa6047b087d
parenta3469d914aaf28a1184247cbe72e5197ce7ca006 (diff)
downloadgitlab-ce-e619d0b615a394a08ca1d0be59f0028c8e390b88.tar.gz
When reCAPTCHA is disabled, allow registrations to go through without a codefeature/recaptcha_settings
-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 485aaf45b01..c48175a4c5a 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::Recaptcha.load_configurations! && 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."