Merge branch 'master' into live
This commit is contained in:
@@ -21,7 +21,7 @@ Bundler.require(*Rails.groups)
|
||||
module Akkounts
|
||||
class Application < Rails::Application
|
||||
# Initialize configuration defaults for originally generated Rails version.
|
||||
config.load_defaults 8.0
|
||||
config.load_defaults 8.1
|
||||
|
||||
# Please, add to the `ignore` list any other `lib` subdirectories that do
|
||||
# not contain `.rb` files, or that should not be reloaded or eager loaded.
|
||||
|
||||
@@ -6,6 +6,7 @@ require 'securerandom'
|
||||
# Many of these configuration options can be set straight in your model.
|
||||
Devise.setup do |config|
|
||||
# Hotwire/Turbo
|
||||
config.parent_controller = 'Users::DeviseController'
|
||||
config.responder.error_status = :unprocessable_entity
|
||||
config.responder.redirect_status = :see_other
|
||||
|
||||
@@ -325,9 +326,9 @@ Devise.setup do |config|
|
||||
# config.sign_in_after_change_password = true
|
||||
end
|
||||
|
||||
# https://github.com/heartcombo/devise/issues/5644
|
||||
class Devise::SecretKeyFinder
|
||||
def find
|
||||
@application.secret_key_base
|
||||
end
|
||||
# Turbo-aware responder for Devise controllers
|
||||
ActiveSupport.on_load(:devise_controller) do
|
||||
self.responder = Users::DeviseController::Responder
|
||||
Users::DeviseController::Responder.error_status = :unprocessable_entity
|
||||
Users::DeviseController::Responder.redirect_status = :see_other
|
||||
end
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
# See https://alvincrespo.hashnode.dev/rails-8s-lazy-route-loading-devise
|
||||
# TODO remove when Devise is fixed
|
||||
require 'devise'
|
||||
Devise # make sure it's already loaded
|
||||
|
||||
module Devise
|
||||
def self.mappings
|
||||
Rails.application.try(:reload_routes_unless_loaded)
|
||||
@@mappings
|
||||
end
|
||||
end
|
||||
Reference in New Issue
Block a user