diff options
Diffstat (limited to 'app/controllers/registrations_controller.rb')
| -rw-r--r-- | app/controllers/registrations_controller.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 8b8d87524a8..1a034f2400c 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -6,8 +6,8 @@ class RegistrationsController < Devise::RegistrationsController before_action :whitelist_query_limiting, only: [:destroy] before_action :ensure_terms_accepted, - if: -> { Gitlab::CurrentSettings.current_application_settings.enforce_terms? }, - only: [:create] + if: -> { Gitlab::CurrentSettings.current_application_settings.enforce_terms? }, + only: [:create] def new redirect_to(new_user_session_path) @@ -27,9 +27,9 @@ class RegistrationsController < Devise::RegistrationsController persist_accepted_terms_if_required(new_user) end else - flash[:alert] = 'There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.' + flash[:alert] = "There was an error with the reCAPTCHA. Please solve the reCAPTCHA again." flash.delete :recaptcha_error - render action: 'new' + render action: "new" end rescue Gitlab::Access::AccessDeniedError redirect_to(new_user_session_path) @@ -39,7 +39,7 @@ class RegistrationsController < Devise::RegistrationsController if destroy_confirmation_valid? current_user.delete_async(deleted_by: current_user) session.try(:destroy) - redirect_to new_user_session_path, status: 303, notice: s_('Profiles|Account scheduled for removal.') + redirect_to new_user_session_path, status: 303, notice: s_("Profiles|Account scheduled for removal.") else redirect_to profile_account_path, status: 303, alert: destroy_confirmation_failure_message end @@ -67,9 +67,9 @@ class RegistrationsController < Devise::RegistrationsController def destroy_confirmation_failure_message if current_user.confirm_deletion_with_password? - s_('Profiles|Invalid password') + s_("Profiles|Invalid password") else - s_('Profiles|Invalid username') + s_("Profiles|Invalid username") end end @@ -106,13 +106,13 @@ class RegistrationsController < Devise::RegistrationsController end def whitelist_query_limiting - Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42380') + Gitlab::QueryLimiting.whitelist("https://gitlab.com/gitlab-org/gitlab-ce/issues/42380") end def ensure_terms_accepted return if terms_accepted? - redirect_to new_user_session_path, alert: _('You must accept our Terms of Service and privacy policy in order to register an account') + redirect_to new_user_session_path, alert: _("You must accept our Terms of Service and privacy policy in order to register an account") end def terms_accepted? |