about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorbeatrix <beatrix.bitrot@gmail.com>2017-12-21 08:30:05 -0500
committerGitHub <noreply@github.com>2017-12-21 08:30:05 -0500
commit4d34b3495df0c915d8a80978d62d8d42e1e2f307 (patch)
tree4678f85ac5f66d3824d88bd76c8d3a139b9e5d50 /app/controllers/settings
parent00d1f8eea1b402f073836bb9b5b99d7207bc4892 (diff)
parenta1ddc89da611598b2af9feb92ee9f1393944ceb9 (diff)
Merge pull request #274 from glitch-soc/fix-packs-on-2fa-pages
Set packs on 2FA-related pages.  Fixes #271.
Diffstat (limited to 'app/controllers/settings')
-rw-r--r--app/controllers/settings/two_factor_authentication/confirmations_controller.rb6
-rw-r--r--app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb6
2 files changed, 2 insertions, 10 deletions
diff --git a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
index 4cf62db13..f1fa03f0a 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 e591e9502..94d1567f3 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!