From 4a069aded1672abddb6170e6abadcd3295db67c2 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Sat, 22 Feb 2020 11:48:45 -0600 Subject: re-add missing theming to sign-in page --- app/controllers/auth/confirmations_controller.rb | 6 ++++++ app/controllers/auth/sessions_controller.rb | 2 ++ 2 files changed, 8 insertions(+) diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb index 0d7c6e7c2..c09c0ceab 100644 --- a/app/controllers/auth/confirmations_controller.rb +++ b/app/controllers/auth/confirmations_controller.rb @@ -1,14 +1,20 @@ + # frozen_string_literal: true class Auth::ConfirmationsController < Devise::ConfirmationsController layout 'auth' before_action :set_body_classes + before_action :set_pack skip_before_action :require_functional! private + def set_pack + use_pack 'auth' + end + def set_body_classes @body_classes = 'lighter' end diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb index 43618b15a..0789cc058 100644 --- a/app/controllers/auth/sessions_controller.rb +++ b/app/controllers/auth/sessions_controller.rb @@ -10,9 +10,11 @@ class Auth::SessionsController < Devise::SessionsController prepend_before_action :authenticate_with_two_factor, if: :two_factor_enabled?, only: [:create] prepend_before_action :switch_user + prepend_before_action :set_pack before_action :set_instance_presenter, only: [:new] before_action :set_body_classes + def new Devise.omniauth_configs.each do |provider, config| return redirect_to(omniauth_authorize_path(resource_name, provider)) if config.strategy.redirect_at_sign_in -- cgit