diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-30 03:09:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-30 03:09:26 +0300 |
| commit | 7c930ae00e3dd714574ebb72bab77303bd1c77c9 (patch) | |
| tree | 8adf88c9ebea2861ce59b5cb34b6b13ab69666a6 /app/controllers | |
| parent | 12c766c77475bb96d18846546d5af909c648830d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/registrations_controller.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 34e2070f9e0..61218a95add 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -9,7 +9,7 @@ class RegistrationsController < Devise::RegistrationsController layout 'devise' prepend_before_action :check_captcha, only: :create - before_action :disable_query_limiting, :ensure_destroy_prerequisites_met, only: [:destroy] + before_action :ensure_destroy_prerequisites_met, only: [:destroy] before_action :load_recaptcha, only: :new before_action :set_invite_params, only: :new @@ -162,10 +162,6 @@ class RegistrationsController < Devise::RegistrationsController @devise_mapping ||= Devise.mappings[:user] end - def disable_query_limiting - Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/-/issues/20798') - end - def load_recaptcha Gitlab::Recaptcha.load_configurations! end |