From bf1eb0912c584318448bc327b347ee526a8dbb93 Mon Sep 17 00:00:00 2001 From: David Yip Date: Wed, 20 Dec 2017 03:15:54 -0600 Subject: [PATCH 1/2] Set packs on 2FA-related pages. Fixes #271. Specifically, this commit: - changes S::TFA::{Confirmations,RecoveryCodes}Controller to derive from S::BaseController, because this gives us the necessary actions and packs - prepends set_pack to Auth::SessionsController's action chain so that it takes effect in time for render :two_factor --- app/controllers/auth/sessions_controller.rb | 2 +- .../two_factor_authentication/confirmations_controller.rb | 6 +----- .../two_factor_authentication/recovery_codes_controller.rb | 6 +----- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb index 72d5441022..f45d77b885 100644 --- a/app/controllers/auth/sessions_controller.rb +++ b/app/controllers/auth/sessions_controller.rb @@ -8,8 +8,8 @@ class Auth::SessionsController < Devise::SessionsController skip_before_action :require_no_authentication, only: [:create] skip_before_action :check_suspension, only: [:destroy] prepend_before_action :authenticate_with_two_factor, if: :two_factor_enabled?, only: [:create] + prepend_before_action :set_pack before_action :set_instance_presenter, only: [:new] - before_action :set_pack def create super do |resource| diff --git a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb index 4cf62db13e..f1fa03f0a6 100644 --- a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb +++ b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb @@ -2,11 +2,7 @@ module Settings module TwoFactorAuthentication - class ConfirmationsController < ApplicationController - layout 'admin' - - before_action :authenticate_user! - + class ConfirmationsController < BaseController def new prepare_two_factor_form end diff --git a/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb b/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb index e591e9502d..94d1567f33 100644 --- a/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb +++ b/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb @@ -2,11 +2,7 @@ module Settings module TwoFactorAuthentication - class RecoveryCodesController < ApplicationController - layout 'admin' - - before_action :authenticate_user! - + class RecoveryCodesController < BaseController def create @recovery_codes = current_user.generate_otp_backup_codes! current_user.save! From a1ddc89da611598b2af9feb92ee9f1393944ceb9 Mon Sep 17 00:00:00 2001 From: David Yip Date: Wed, 20 Dec 2017 20:02:50 -0600 Subject: [PATCH 2/2] Remove unused themes.default key in ko locale. --- config/locales/ko.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/locales/ko.yml b/config/locales/ko.yml index a60884b276..31c946c00e 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -615,8 +615,6 @@ ko: sensitive_content: 민감한 컨텐츠 terms: title: "%{instance} 이용약관과 개인정보 취급 방침" - themes: - default: Mastodon time: formats: default: "%Y년 %m월 %d일 %H:%M"