diff --git a/.dassie/config/application.rb b/.dassie/config/application.rb index fe63051ef3..e676ff4cdb 100644 --- a/.dassie/config/application.rb +++ b/.dassie/config/application.rb @@ -9,7 +9,8 @@ module Dassie class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 6.0 + config.load_defaults 7.2 + config.add_autoload_paths_to_load_path = true # Settings in config/environments/* take precedence over those specified here. # Application configuration can go into files in config/initializers diff --git a/.koppie/config/application.rb b/.koppie/config/application.rb index c7b45b42f6..58aed3bdb5 100644 --- a/.koppie/config/application.rb +++ b/.koppie/config/application.rb @@ -9,7 +9,8 @@ module Koppie class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 6.0 + config.load_defaults 7.2 + config.add_autoload_paths_to_load_path = true # Settings in config/environments/* take precedence over those specified here. # Application configuration can go into files in config/initializers diff --git a/app/controllers/hyrax/api/zotero_controller.rb b/app/controllers/hyrax/api/zotero_controller.rb index 903dc12963..724c9aed97 100644 --- a/app/controllers/hyrax/api/zotero_controller.rb +++ b/app/controllers/hyrax/api/zotero_controller.rb @@ -14,7 +14,7 @@ def initiate session[:request_token] = request_token current_user.zotero_token = request_token current_user.save - redirect_to request_token.authorize_url(identity: '1', oauth_callback: callback_url) + redirect_to request_token.authorize_url(identity: '1', oauth_callback: callback_url), allow_other_host: true rescue OAuth::Unauthorized redirect_to root_url, alert: 'Invalid Zotero client key pair' end diff --git a/config/initializers/new_framework_defaults_7_2.rb b/config/initializers/new_framework_defaults_7_2.rb new file mode 100644 index 0000000000..6d2cb87af6 --- /dev/null +++ b/config/initializers/new_framework_defaults_7_2.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +# Any options set here are to override Rails 7.2 configuration defaults + +# These fix a couple of issues arising from Rails 7.2 enforcement of HTML5 semantics +# by default when using certain Rails methods +Rails.application.config.action_view.button_to_generates_button_tag = false +Rails.application.config.action_view.sanitizer_vendor = Rails::HTML4::Sanitizer diff --git a/lib/generators/hyrax/install_generator.rb b/lib/generators/hyrax/install_generator.rb index 834e552061..6f59d626b4 100644 --- a/lib/generators/hyrax/install_generator.rb +++ b/lib/generators/hyrax/install_generator.rb @@ -188,7 +188,7 @@ def riiif_image_server generate 'hyrax:riiif' unless options[:'skip-riiif'] end - def insert_env_queue_adapter + def insert_application_config insert_into_file 'config/application.rb', after: /config\.load_defaults [0-9.]+$/ do "\n config.active_job.queue_adapter = ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE') { 'async' }.to_sym\n" end diff --git a/template.rb b/template.rb index b976535e13..03a7c79bff 100644 --- a/template.rb +++ b/template.rb @@ -1,4 +1,9 @@ # frozen_string_literal: true + +insert_into_file 'config/application.rb', after: /config\.load_defaults [0-9.]+$/ do + "\n config.add_autoload_paths_to_load_path = true" +end + gem 'hyrax', '5.0.3' run 'bundle install' generate 'hyrax:install', '-f'