From 2488878fcf3f65a65d0c494326f8a1a5dad96932 Mon Sep 17 00:00:00 2001 From: Shuhei Date: Fri, 18 Oct 2024 15:57:01 +0900 Subject: [PATCH] move mixin include to the bottom of the controller --- app/controllers/scimitar/application_controller.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/scimitar/application_controller.rb b/app/controllers/scimitar/application_controller.rb index 7cb7488..e9e4c71 100644 --- a/app/controllers/scimitar/application_controller.rb +++ b/app/controllers/scimitar/application_controller.rb @@ -9,10 +9,6 @@ class ApplicationController < ActionController::Base before_action :add_mandatory_response_headers before_action :authenticate - if Scimitar.engine_configuration.application_controller_mixin - include Scimitar.engine_configuration.application_controller_mixin - end - # ========================================================================= # PROTECTED INSTANCE METHODS # ========================================================================= @@ -153,5 +149,8 @@ def authenticated? return result end + if Scimitar.engine_configuration.application_controller_mixin + include Scimitar.engine_configuration.application_controller_mixin + end end end