From 9d08b81193d5be33365fb24db43aae54627c172b Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 5 Apr 2023 19:31:49 +0200 Subject: Fix user archive takeouts when using OpenStack Swift (#24431) --- app/controllers/backups_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers') diff --git a/app/controllers/backups_controller.rb b/app/controllers/backups_controller.rb index 0687b62c5..5891da6f6 100644 --- a/app/controllers/backups_controller.rb +++ b/app/controllers/backups_controller.rb @@ -13,7 +13,7 @@ class BackupsController < ApplicationController when :s3 redirect_to @backup.dump.expiring_url(10) when :fog - if Paperclip::Attachment.default_options.dig(:storage, :fog_credentials, :openstack_temp_url_key).present? + if Paperclip::Attachment.default_options.dig(:fog_credentials, :openstack_temp_url_key).present? redirect_to @backup.dump.expiring_url(Time.now.utc + 10) else redirect_to full_asset_url(@backup.dump.url) -- cgit From d193bc8c5c3fe45b76c21a16165405d997b6a411 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 7 Apr 2023 14:13:53 +0200 Subject: Remove unused methods in 2FA OTP Auth Controller (#24220) --- .../two_factor_authentication/otp_authentication_controller.rb | 9 --------- 1 file changed, 9 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb b/app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb index cbba842a9..0bff01ec2 100644 --- a/app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb +++ b/app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb @@ -22,18 +22,9 @@ module Settings private - def confirmation_params - params.require(:form_two_factor_confirmation).permit(:otp_attempt) - end - def verify_otp_not_enabled redirect_to settings_two_factor_authentication_methods_path if current_user.otp_enabled? end - - def acceptable_code? - current_user.validate_and_consume_otp!(confirmation_params[:otp_attempt]) || - current_user.invalidate_otp_backup_code!(confirmation_params[:otp_attempt]) - end end end end -- cgit