Commit 4e8424bf authored by Ash McKenzie's avatar Ash McKenzie

Merge branch '214382-remove-registrations_recaptcha-feature-flag' into 'master'

Remove registrations_recaptcha feature flag

See merge request gitlab-org/gitlab!31797
parents 651192e6 362b09e7
...@@ -137,7 +137,6 @@ class RegistrationsController < Devise::RegistrationsController ...@@ -137,7 +137,6 @@ class RegistrationsController < Devise::RegistrationsController
def check_captcha def check_captcha
ensure_correct_params! ensure_correct_params!
return unless Feature.enabled?(:registrations_recaptcha, default_enabled: true) # reCAPTCHA on the UI will still display however
return unless show_recaptcha_sign_up? return unless show_recaptcha_sign_up?
return unless Gitlab::Recaptcha.load_configurations! return unless Gitlab::Recaptcha.load_configurations!
......
---
title: Remove registrations_recaptcha feature flag.
merge_request: 31797
author: Gilang Gumilar
type: removed
...@@ -144,16 +144,6 @@ describe RegistrationsController do ...@@ -144,16 +144,6 @@ describe RegistrationsController do
expect(flash[:notice]).to eq(I18n.t('devise.registrations.signed_up')) expect(flash[:notice]).to eq(I18n.t('devise.registrations.signed_up'))
end end
it 'does not require reCAPTCHA if disabled by feature flag' do
stub_feature_flags(registrations_recaptcha: false)
post(:create, params: user_params)
expect(controller).not_to receive(:verify_recaptcha)
expect(flash[:alert]).to be_nil
expect(flash[:notice]).to eq(I18n.t('devise.registrations.signed_up'))
end
end end
context 'when invisible captcha is enabled' do context 'when invisible captcha is enabled' do
...@@ -294,8 +284,6 @@ describe RegistrationsController do ...@@ -294,8 +284,6 @@ describe RegistrationsController do
end end
it "logs a 'User Created' message" do it "logs a 'User Created' message" do
stub_feature_flags(registrations_recaptcha: false)
expect(Gitlab::AppLogger).to receive(:info).with(/\AUser Created: username=new_username email=new@user.com.+\z/).and_call_original expect(Gitlab::AppLogger).to receive(:info).with(/\AUser Created: username=new_username email=new@user.com.+\z/).and_call_original
post(:create, params: user_params) post(:create, params: user_params)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment