tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #274 from glitch-soc/fix-packs-on-2fa-pages

Browse Source 
Set packs on 2FA-related pages.  Fixes #271.
This commit is contained in:
beatrix 2017-12-21 08:30:05 -05:00 committed by GitHub
commit 4d34b3495d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/auth/sessions_controller.rb
View File

@ -8,8 +8,8 @@ class Auth::SessionsController < Devise::SessionsController
skip_before_action :require_no_authentication, only: [:create] skip_before_action :require_no_authentication, only: [:create]
skip_before_action :check_suspension, only: [:destroy] skip_before_action :check_suspension, only: [:destroy]
prepend_before_action :authenticate_with_two_factor, if: :two_factor_enabled?, only: [:create] 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_instance_presenter, only: [:new]
before_action :set_pack
def create def create
super do |resource| super do |resource|

6
app/controllers/settings/two_factor_authentication/confirmations_controller.rb
View File

@ -2,11 +2,7 @@
module Settings module Settings
module TwoFactorAuthentication module TwoFactorAuthentication
class ConfirmationsController < ApplicationController class ConfirmationsController < BaseController
layout 'admin'
before_action :authenticate_user!
def new def new
prepare_two_factor_form prepare_two_factor_form
end end

6
app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
View File

@ -2,11 +2,7 @@
module Settings module Settings
module TwoFactorAuthentication module TwoFactorAuthentication
class RecoveryCodesController < ApplicationController class RecoveryCodesController < BaseController
layout 'admin'
before_action :authenticate_user!
def create def create
@recovery_codes = current_user.generate_otp_backup_codes! @recovery_codes = current_user.generate_otp_backup_codes!
current_user.save! current_user.save!

2
config/locales/ko.yml
View File

@ -615,8 +615,6 @@ ko:
sensitive_content: 민감한 컨텐츠 sensitive_content: 민감한 컨텐츠
terms: terms:
title: "%{instance} 이용약관과 개인정보 취급 방침" title: "%{instance} 이용약관과 개인정보 취급 방침"
themes:
default: Mastodon
time: time:
formats: formats:
default: "%Y년 %m월 %d일 %H:%M" default: "%Y년 %m월 %d일 %H:%M"