From ef1e073ee36d9d3f814a6229435f36a03a8ff31c Mon Sep 17 00:00:00 2001 From: Chad Wilson <29788154+chadlwilson@users.noreply.github.com> Date: Tue, 3 Feb 2026 13:39:19 +0800 Subject: [PATCH 1/2] [tests] Test against JRuby 10.0.3.0 --- .github/workflows/maven.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a0cfe935..24b9fdb5 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -19,15 +19,15 @@ jobs: strategy: matrix: - jruby_version: [ '9.4.14.0', '10.0.2.0' ] + jruby_version: [ '9.4.14.0', '10.0.3.0' ] java_version: [ '8', '11', '17', '21', '25' ] rack_version: [ '~> 2.2.0' ] exclude: - - jruby_version: '10.0.2.0' + - jruby_version: '10.0.3.0' java_version: '8' # JRuby 10 requires Java 21 - - jruby_version: '10.0.2.0' + - jruby_version: '10.0.3.0' java_version: '11' # JRuby 10 requires Java 21 - - jruby_version: '10.0.2.0' + - jruby_version: '10.0.3.0' java_version: '17' # JRuby 10 requires Java 21 fail-fast: false @@ -65,14 +65,14 @@ jobs: 'rails72_rack22', 'rails80_rack22', ] - jruby_version: [ '9.4.14.0', '10.0.2.0' ] + jruby_version: [ '9.4.14.0', '10.0.3.0' ] java_version: [ '8', '11', '17', '21', '25' ] exclude: - - jruby_version: '10.0.2.0' + - jruby_version: '10.0.3.0' java_version: '8' # JRuby 10 requires Java 21 - - jruby_version: '10.0.2.0' + - jruby_version: '10.0.3.0' java_version: '11' # JRuby 10 requires Java 21 - - jruby_version: '10.0.2.0' + - jruby_version: '10.0.3.0' java_version: '17' # JRuby 10 requires Java 21 - appraisal: 'rails80_rack22' jruby_version: '9.4.14.0' # Rails 8 requires Ruby 3.4 compatibility, which JRuby 9.4 does not support From c653492102c868f57fbafa7c6ca2bcc30ccf473a Mon Sep 17 00:00:00 2001 From: Chad Wilson <29788154+chadlwilson@users.noreply.github.com> Date: Fri, 6 Feb 2026 22:54:16 +0800 Subject: [PATCH 2/2] [tests] Drop testing against Rails 6.1 and official support Rails 6.1 has been security EOL for 14 months now. It still functions, but likely requires some dependency hacks on JRuby 10 due to Ruby 3.4 stdlib. Shouldn't be a need to maintain official support for the 1.3+ stream. --- .github/workflows/maven.yml | 1 - Appraisals | 1 - CHANGELOG.md | 2 +- README.md | 14 +-- src/spec/ruby/jruby/rack/integration_spec.rb | 4 - .../app/controllers/application_controller.rb | 2 - .../rails61/app/helpers/application_helper.rb | 2 - src/spec/stub/rails61/config/application.rb | 38 -------- src/spec/stub/rails61/config/boot.rb | 6 -- .../stub/rails61/config/credentials.yml.enc | 1 - src/spec/stub/rails61/config/environment.rb | 5 - .../config/environments/development.rb | 55 ----------- .../rails61/config/environments/production.rb | 94 ------------------- .../stub/rails61/config/environments/test.rb | 49 ---------- .../application_controller_renderer.rb | 8 -- .../initializers/backtrace_silencers.rb | 8 -- .../initializers/content_security_policy.rb | 28 ------ .../config/initializers/cookies_serializer.rb | 5 - .../initializers/filter_parameter_logging.rb | 6 -- .../config/initializers/inflections.rb | 16 ---- .../rails61/config/initializers/mime_types.rb | 4 - .../config/initializers/permissions_policy.rb | 11 --- .../config/initializers/wrap_parameters.rb | 9 -- src/spec/stub/rails61/config/locales/en.yml | 33 ------- src/spec/stub/rails61/config/master.key | 1 - src/spec/stub/rails61/config/routes.rb | 3 - src/spec/stub/rails61/public/robots.txt | 1 - 27 files changed, 8 insertions(+), 399 deletions(-) delete mode 100644 src/spec/stub/rails61/app/controllers/application_controller.rb delete mode 100644 src/spec/stub/rails61/app/helpers/application_helper.rb delete mode 100644 src/spec/stub/rails61/config/application.rb delete mode 100644 src/spec/stub/rails61/config/boot.rb delete mode 100644 src/spec/stub/rails61/config/credentials.yml.enc delete mode 100644 src/spec/stub/rails61/config/environment.rb delete mode 100644 src/spec/stub/rails61/config/environments/development.rb delete mode 100644 src/spec/stub/rails61/config/environments/production.rb delete mode 100644 src/spec/stub/rails61/config/environments/test.rb delete mode 100644 src/spec/stub/rails61/config/initializers/application_controller_renderer.rb delete mode 100644 src/spec/stub/rails61/config/initializers/backtrace_silencers.rb delete mode 100644 src/spec/stub/rails61/config/initializers/content_security_policy.rb delete mode 100644 src/spec/stub/rails61/config/initializers/cookies_serializer.rb delete mode 100644 src/spec/stub/rails61/config/initializers/filter_parameter_logging.rb delete mode 100644 src/spec/stub/rails61/config/initializers/inflections.rb delete mode 100644 src/spec/stub/rails61/config/initializers/mime_types.rb delete mode 100644 src/spec/stub/rails61/config/initializers/permissions_policy.rb delete mode 100644 src/spec/stub/rails61/config/initializers/wrap_parameters.rb delete mode 100644 src/spec/stub/rails61/config/locales/en.yml delete mode 100644 src/spec/stub/rails61/config/master.key delete mode 100644 src/spec/stub/rails61/config/routes.rb delete mode 100644 src/spec/stub/rails61/public/robots.txt diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 24b9fdb5..79b1b9ac 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -59,7 +59,6 @@ jobs: strategy: matrix: appraisal: [ - 'rails61_rack22', 'rails70_rack22', 'rails71_rack22', 'rails72_rack22', diff --git a/Appraisals b/Appraisals index dd04ccfa..3275e152 100644 --- a/Appraisals +++ b/Appraisals @@ -3,7 +3,6 @@ version_spec = ->(prefix, desc) { "~> #{desc.split(prefix).last.insert(1, ".")}. # Rails version -> rack versions in format # rails#{MAJOR}#{MINOR} => %w[ rack#{MAJOR}#{MINOR} ] { - "rails61" => %w[rack22], "rails70" => %w[rack22], "rails71" => %w[rack22], "rails72" => %w[rack22], diff --git a/CHANGELOG.md b/CHANGELOG.md index 35822347..8646ccf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ Breaking compatibility changes - Drop support for JRuby 9.3 -- Drop support for Rails < 6.1 +- Drop support for Rails < 7.0 Breaking behavioral changes - Change context listener to throw by default in case of an exception during initialization diff --git a/README.md b/README.md index 48158b50..1b7bf0e7 100644 --- a/README.md +++ b/README.md @@ -13,13 +13,13 @@ For more information on Rack, visit http://rack.github.io/. ## Compatibility -| JRuby-Rack Series | Status | Rack | JRuby | Java | Rails | Target Servlet API | Notes | -|------------------------------------------------------------|------------|-----------|------------|------|-----------|---------------------|--------------------------------------------| -| 2.0 (_planned_) | Dev | 2.2 | 9.4 → 10.0 | 8+ | 6.1 → 8.0 | 5.0+ (Jakarta EE 9) | Pre 5.0 servlet APIs non functional. | -| 1.3 (master, _unreleased_) | Dev | 2.2 | 9.4 → 10.0 | 8+ | 6.1 → 8.0 | 4.0 (Java EE 8) | Servlet 2.5 → 3.1 likely to work fine. | -| [1.2](https://github.com/jruby/jruby-rack/tree/1.2-stable) | Maintained | 2.2 | 9.3 → 9.4 | 8+ | 5.0 → 7.2 | 3.0 (Java EE 6) | Servlet 3.1 → 4.0 OK with some containers. | -| [1.1](https://github.com/jruby/jruby-rack/tree/1.1-stable) | EOL | 1.x → 2.2 | 1.6 → 9.4 | 6+ | 2.1 → 5.2 | 2.5 (Java EE 5) | Servlet 3.0 → 4.0 OK with some containers. | -| 1.0 | EOL | 0.9 → 1.x | 1.1 → 1.9 | 5+ | 2.1 → 3.x | 2.5 (Java EE 5) | | +| JRuby-Rack Series | Status | Rack | JRuby | Java | Rails | Target Servlet API | Notes | +|----------------------------------------------------------------|---------------|-----------|------------|------|-----------|---------------------|----------------------------------------------------------------| +| **2.0 (_planned_, _unreleased_)** | Dev | 2.2 | 9.4 → 10.0 | 8+ | 7.0 → 8.0 | 5.0+ (Jakarta EE 9) | ❌ Servlet < 5.0 containers will not work | +| **1.3 (master, _unreleased_)** | Dev | 2.2 | 9.4 → 10.0 | 8+ | 7.0 → 8.0 | 4.0 (Java EE 8) | ✅ _Unofficial_: Servlet 2.5 → 3.1 & Rails 6.1 likely working | +| [**1.2**](https://github.com/jruby/jruby-rack/tree/1.2-stable) | Maintained | 2.2 | 9.3 → 9.4 | 8+ | 5.0 → 7.2 | 3.0 (Java EE 6) | ✅ _Unofficial_: Servlet 3.1 → 4.0 also OK with most containers | +| [**1.1**](https://github.com/jruby/jruby-rack/tree/1.1-stable) | EOL @ 2024-05 | 1.x → 2.2 | 1.6 → 9.4 | 6+ | 2.1 → 5.2 | 2.5 (Java EE 5) | ✅ _Unofficial_: Servlet 3.0 → 4.0 also OK with most containers | +| [**1.0**](https://github.com/jruby/jruby-rack/tree/1.0.10) | EOL @ 2011-11 | 0.9 → 1.x | 1.1 → 1.9 | 5+ | 2.1 → 3.x | 2.5 (Java EE 5) | | ## Getting Started diff --git a/src/spec/ruby/jruby/rack/integration_spec.rb b/src/spec/ruby/jruby/rack/integration_spec.rb index 1ba98724..561d91f9 100644 --- a/src/spec/ruby/jruby/rack/integration_spec.rb +++ b/src/spec/ruby/jruby/rack/integration_spec.rb @@ -203,10 +203,6 @@ end end - describe 'rails 6.1', lib: :rails61 do - it_should_behave_like 'a rails app' - end - describe 'rails 7.0', lib: :rails70 do it_should_behave_like 'a rails app' end diff --git a/src/spec/stub/rails61/app/controllers/application_controller.rb b/src/spec/stub/rails61/app/controllers/application_controller.rb deleted file mode 100644 index 09705d12..00000000 --- a/src/spec/stub/rails61/app/controllers/application_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class ApplicationController < ActionController::Base -end diff --git a/src/spec/stub/rails61/app/helpers/application_helper.rb b/src/spec/stub/rails61/app/helpers/application_helper.rb deleted file mode 100644 index de6be794..00000000 --- a/src/spec/stub/rails61/app/helpers/application_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApplicationHelper -end diff --git a/src/spec/stub/rails61/config/application.rb b/src/spec/stub/rails61/config/application.rb deleted file mode 100644 index 9f1353e9..00000000 --- a/src/spec/stub/rails61/config/application.rb +++ /dev/null @@ -1,38 +0,0 @@ -require_relative "boot" - -require "rails" -# Pick the frameworks you want: -require "active_model/railtie" -# require "active_job/railtie" -# require "active_record/railtie" -# require "active_storage/engine" -require "action_controller/railtie" -# require "action_mailer/railtie" -# require "action_mailbox/engine" -# require "action_text/engine" -require "action_view/railtie" -# require "action_cable/engine" -# require "sprockets/railtie" -# require "rails/test_unit/railtie" - -# Require the gems listed in Gemfile, including any gems -# you've limited to :test, :development, or :production. -Bundler.require(*Rails.groups) - -module Rails61 - class Application < Rails::Application - # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 6.1 - - # Configuration for the application, engines, and railties goes here. - # - # These settings can be overridden in specific environments using the files - # in config/environments, which are processed later. - # - # config.time_zone = "Central Time (US & Canada)" - # config.eager_load_paths << Rails.root.join("extras") - - # Don't generate system test files. - config.generators.system_tests = nil - end -end diff --git a/src/spec/stub/rails61/config/boot.rb b/src/spec/stub/rails61/config/boot.rb deleted file mode 100644 index 9e68e5f0..00000000 --- a/src/spec/stub/rails61/config/boot.rb +++ /dev/null @@ -1,6 +0,0 @@ -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) - -require "bundler/setup" # Set up gems listed in the Gemfile. - -# workaround for https://github.com/ruby-concurrency/concurrent-ruby/issues/1077 since https://github.com/rails/rails/pull/54264 wont be backported earlier than 7.1. -require "logger" diff --git a/src/spec/stub/rails61/config/credentials.yml.enc b/src/spec/stub/rails61/config/credentials.yml.enc deleted file mode 100644 index 617e129f..00000000 --- a/src/spec/stub/rails61/config/credentials.yml.enc +++ /dev/null @@ -1 +0,0 @@ -h7j6TBtL1MQo4aye3KuFMJqXjsojY1IPfhda51j54oYS0xgUgqz+5wlsyq7mFhh549MUTEWxaYWm1bDOooOtMKrIuUzDkXfgyZLWyvhMtfGRbe74a/SGS+M8SDXN65XgeVcYpiZxIHmTeXj/FQ2t3nXjXkQV1g892+XFzgB1mYE59B6B1b21m0lVVSKMXHZhVguZEMnAB6sdVDIdQQA2xOFllnVcIdAvifHE0GYKgALCgdVeRDs1Ob3xZp0cXaZBqGl27lR1a+8MyR1ZDwZ08aysmtzY4koUE6JR5Auv3SBpVr0xXihTWZB55/H0b6t1SXiGRr06EnsM1libanIX1II36IBcsi4MOMLjj89KDUaLOTfbFMtcRMh+r7YHZEgIQksMVl6yxQVH3tjzlbgPXC5alj+sICKsh1ve--YuCA+1XrgTwmE0Oc--JvkiuzV70g4zSz7VF3/21w== \ No newline at end of file diff --git a/src/spec/stub/rails61/config/environment.rb b/src/spec/stub/rails61/config/environment.rb deleted file mode 100644 index cac53157..00000000 --- a/src/spec/stub/rails61/config/environment.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Load the Rails application. -require_relative "application" - -# Initialize the Rails application. -Rails.application.initialize! diff --git a/src/spec/stub/rails61/config/environments/development.rb b/src/spec/stub/rails61/config/environments/development.rb deleted file mode 100644 index 1181937f..00000000 --- a/src/spec/stub/rails61/config/environments/development.rb +++ /dev/null @@ -1,55 +0,0 @@ -require "active_support/core_ext/integer/time" - -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - # In the development environment your application's code is reloaded any time - # it changes. This slows down response time but is perfect for development - # since you don't have to restart the web server when you make code changes. - config.cache_classes = false - - # Do not eager load code on boot. - config.eager_load = false - - # Show full error reports. - config.consider_all_requests_local = true - - # Enable/disable caching. By default caching is disabled. - # Run rails dev:cache to toggle caching. - if Rails.root.join('tmp', 'caching-dev.txt').exist? - config.action_controller.perform_caching = true - config.action_controller.enable_fragment_cache_logging = true - - config.cache_store = :memory_store - config.public_file_server.headers = { - 'Cache-Control' => "public, max-age=#{2.days.to_i}" - } - else - config.action_controller.perform_caching = false - - config.cache_store = :null_store - end - - # Print deprecation notices to the Rails logger. - config.active_support.deprecation = :log - - # Raise exceptions for disallowed deprecations. - config.active_support.disallowed_deprecation = :raise - - # Tell Active Support which deprecation messages to disallow. - config.active_support.disallowed_deprecation_warnings = [] - - - # Raises error for missing translations. - # config.i18n.raise_on_missing_translations = true - - # Annotate rendered view with file names. - # config.action_view.annotate_rendered_view_with_filenames = true - - # Use an evented file watcher to asynchronously detect changes in source code, - # routes, locales, etc. This feature depends on the listen gem. - # config.file_watcher = ActiveSupport::EventedFileUpdateChecker - - # Uncomment if you wish to allow Action Cable access from any origin. - # config.action_cable.disable_request_forgery_protection = true -end diff --git a/src/spec/stub/rails61/config/environments/production.rb b/src/spec/stub/rails61/config/environments/production.rb deleted file mode 100644 index 0d5988d6..00000000 --- a/src/spec/stub/rails61/config/environments/production.rb +++ /dev/null @@ -1,94 +0,0 @@ -require "active_support/core_ext/integer/time" - -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - # Code is not reloaded between requests. - config.cache_classes = true - - # Eager load code on boot. This eager loads most of Rails and - # your application in memory, allowing both threaded web servers - # and those relying on copy on write to perform better. - # Rake tasks automatically ignore this option for performance. - config.eager_load = true - - # Full error reports are disabled and caching is turned on. - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] - # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). - # config.require_master_key = true - - # Disable serving static files from the `/public` folder by default since - # Apache or NGINX already handles this. - config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? - - # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.asset_host = 'http://assets.example.com' - - # Specifies the header that your server uses for sending files. - # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true - - # Include generic and useful information about system operation, but avoid logging too much - # information to avoid inadvertent exposure of personally identifiable information (PII). - config.log_level = :info - - # Prepend all log lines with the following tags. - config.log_tags = [ :request_id ] - - # Use a different cache store in production. - # config.cache_store = :mem_cache_store - - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation cannot be found). - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners. - config.active_support.deprecation = :notify - - # Log disallowed deprecations. - config.active_support.disallowed_deprecation = :log - - # Tell Active Support which deprecation messages to disallow. - config.active_support.disallowed_deprecation_warnings = [] - - # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = ::Logger::Formatter.new - - # Use a different logger for distributed setups. - # require "syslog/logger" - # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') - - if ENV["RAILS_LOG_TO_STDOUT"].present? - logger = ActiveSupport::Logger.new(STDOUT) - logger.formatter = config.log_formatter - config.logger = ActiveSupport::TaggedLogging.new(logger) - end - - # Inserts middleware to perform automatic connection switching. - # The `database_selector` hash is used to pass options to the DatabaseSelector - # middleware. The `delay` is used to determine how long to wait after a write - # to send a subsequent read to the primary. - # - # The `database_resolver` class is used by the middleware to determine which - # database is appropriate to use based on the time delay. - # - # The `database_resolver_context` class is used by the middleware to set - # timestamps for the last write to the primary. The resolver uses the context - # class timestamps to determine how long to wait before reading from the - # replica. - # - # By default Rails will store a last write timestamp in the session. The - # DatabaseSelector middleware is designed as such you can define your own - # strategy for connection switching and pass that into the middleware through - # these configuration options. - # config.active_record.database_selector = { delay: 2.seconds } - # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver - # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session -end diff --git a/src/spec/stub/rails61/config/environments/test.rb b/src/spec/stub/rails61/config/environments/test.rb deleted file mode 100644 index 9fa79ddf..00000000 --- a/src/spec/stub/rails61/config/environments/test.rb +++ /dev/null @@ -1,49 +0,0 @@ -require "active_support/core_ext/integer/time" - -# The test environment is used exclusively to run your application's -# test suite. You never need to work with it otherwise. Remember that -# your test database is "scratch space" for the test suite and is wiped -# and recreated between test runs. Don't rely on the data there! - -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - config.cache_classes = true - - # Do not eager load code on boot. This avoids loading your whole application - # just for the purpose of running a single test. If you are using a tool that - # preloads Rails for running tests, you may have to set it to true. - config.eager_load = false - - # Configure public file server for tests with Cache-Control for performance. - config.public_file_server.enabled = true - config.public_file_server.headers = { - 'Cache-Control' => "public, max-age=#{1.hour.to_i}" - } - - # Show full error reports and disable caching. - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - config.cache_store = :null_store - - # Raise exceptions instead of rendering exception templates. - config.action_dispatch.show_exceptions = false - - # Disable request forgery protection in test environment. - config.action_controller.allow_forgery_protection = false - - # Print deprecation notices to the stderr. - config.active_support.deprecation = :stderr - - # Raise exceptions for disallowed deprecations. - config.active_support.disallowed_deprecation = :raise - - # Tell Active Support which deprecation messages to disallow. - config.active_support.disallowed_deprecation_warnings = [] - - # Raises error for missing translations. - # config.i18n.raise_on_missing_translations = true - - # Annotate rendered view with file names. - # config.action_view.annotate_rendered_view_with_filenames = true -end diff --git a/src/spec/stub/rails61/config/initializers/application_controller_renderer.rb b/src/spec/stub/rails61/config/initializers/application_controller_renderer.rb deleted file mode 100644 index 89d2efab..00000000 --- a/src/spec/stub/rails61/config/initializers/application_controller_renderer.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# ActiveSupport::Reloader.to_prepare do -# ApplicationController.renderer.defaults.merge!( -# http_host: 'example.org', -# https: false -# ) -# end diff --git a/src/spec/stub/rails61/config/initializers/backtrace_silencers.rb b/src/spec/stub/rails61/config/initializers/backtrace_silencers.rb deleted file mode 100644 index 33699c30..00000000 --- a/src/spec/stub/rails61/config/initializers/backtrace_silencers.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. -# Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) } - -# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code -# by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'". -Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"] diff --git a/src/spec/stub/rails61/config/initializers/content_security_policy.rb b/src/spec/stub/rails61/config/initializers/content_security_policy.rb deleted file mode 100644 index 41c43016..00000000 --- a/src/spec/stub/rails61/config/initializers/content_security_policy.rb +++ /dev/null @@ -1,28 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Define an application-wide content security policy -# For further information see the following documentation -# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy - -# Rails.application.config.content_security_policy do |policy| -# policy.default_src :self, :https -# policy.font_src :self, :https, :data -# policy.img_src :self, :https, :data -# policy.object_src :none -# policy.script_src :self, :https -# policy.style_src :self, :https - -# # Specify URI for violation reports -# # policy.report_uri "/csp-violation-report-endpoint" -# end - -# If you are using UJS then enable automatic nonce generation -# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } - -# Set the nonce only to specific directives -# Rails.application.config.content_security_policy_nonce_directives = %w(script-src) - -# Report CSP violations to a specified URI -# For further information see the following documentation: -# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only -# Rails.application.config.content_security_policy_report_only = true diff --git a/src/spec/stub/rails61/config/initializers/cookies_serializer.rb b/src/spec/stub/rails61/config/initializers/cookies_serializer.rb deleted file mode 100644 index 5a6a32d3..00000000 --- a/src/spec/stub/rails61/config/initializers/cookies_serializer.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Specify a serializer for the signed and encrypted cookie jars. -# Valid options are :json, :marshal, and :hybrid. -Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/src/spec/stub/rails61/config/initializers/filter_parameter_logging.rb b/src/spec/stub/rails61/config/initializers/filter_parameter_logging.rb deleted file mode 100644 index 4b34a036..00000000 --- a/src/spec/stub/rails61/config/initializers/filter_parameter_logging.rb +++ /dev/null @@ -1,6 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Configure sensitive parameters which will be filtered from the log file. -Rails.application.config.filter_parameters += [ - :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn -] diff --git a/src/spec/stub/rails61/config/initializers/inflections.rb b/src/spec/stub/rails61/config/initializers/inflections.rb deleted file mode 100644 index ac033bf9..00000000 --- a/src/spec/stub/rails61/config/initializers/inflections.rb +++ /dev/null @@ -1,16 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new inflection rules using the following format. Inflections -# are locale specific, and you may define rules for as many different -# locales as you wish. All of these examples are active by default: -# ActiveSupport::Inflector.inflections(:en) do |inflect| -# inflect.plural /^(ox)$/i, '\1en' -# inflect.singular /^(ox)en/i, '\1' -# inflect.irregular 'person', 'people' -# inflect.uncountable %w( fish sheep ) -# end - -# These inflection rules are supported but not enabled by default: -# ActiveSupport::Inflector.inflections(:en) do |inflect| -# inflect.acronym 'RESTful' -# end diff --git a/src/spec/stub/rails61/config/initializers/mime_types.rb b/src/spec/stub/rails61/config/initializers/mime_types.rb deleted file mode 100644 index dc189968..00000000 --- a/src/spec/stub/rails61/config/initializers/mime_types.rb +++ /dev/null @@ -1,4 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new mime types for use in respond_to blocks: -# Mime::Type.register "text/richtext", :rtf diff --git a/src/spec/stub/rails61/config/initializers/permissions_policy.rb b/src/spec/stub/rails61/config/initializers/permissions_policy.rb deleted file mode 100644 index 00f64d71..00000000 --- a/src/spec/stub/rails61/config/initializers/permissions_policy.rb +++ /dev/null @@ -1,11 +0,0 @@ -# Define an application-wide HTTP permissions policy. For further -# information see https://developers.google.com/web/updates/2018/06/feature-policy -# -# Rails.application.config.permissions_policy do |f| -# f.camera :none -# f.gyroscope :none -# f.microphone :none -# f.usb :none -# f.fullscreen :self -# f.payment :self, "https://secure.example.com" -# end diff --git a/src/spec/stub/rails61/config/initializers/wrap_parameters.rb b/src/spec/stub/rails61/config/initializers/wrap_parameters.rb deleted file mode 100644 index 633c1c88..00000000 --- a/src/spec/stub/rails61/config/initializers/wrap_parameters.rb +++ /dev/null @@ -1,9 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# This file contains settings for ActionController::ParamsWrapper which -# is enabled by default. - -# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. -ActiveSupport.on_load(:action_controller) do - wrap_parameters format: [:json] -end diff --git a/src/spec/stub/rails61/config/locales/en.yml b/src/spec/stub/rails61/config/locales/en.yml deleted file mode 100644 index cf9b342d..00000000 --- a/src/spec/stub/rails61/config/locales/en.yml +++ /dev/null @@ -1,33 +0,0 @@ -# Files in the config/locales directory are used for internationalization -# and are automatically loaded by Rails. If you want to use locales other -# than English, add the necessary files in this directory. -# -# To use the locales, use `I18n.t`: -# -# I18n.t 'hello' -# -# In views, this is aliased to just `t`: -# -# <%= t('hello') %> -# -# To use a different locale, set it with `I18n.locale`: -# -# I18n.locale = :es -# -# This would use the information in config/locales/es.yml. -# -# The following keys must be escaped otherwise they will not be retrieved by -# the default I18n backend: -# -# true, false, on, off, yes, no -# -# Instead, surround them with single quotes. -# -# en: -# 'true': 'foo' -# -# To learn more, please read the Rails Internationalization guide -# available at https://guides.rubyonrails.org/i18n.html. - -en: - hello: "Hello world" diff --git a/src/spec/stub/rails61/config/master.key b/src/spec/stub/rails61/config/master.key deleted file mode 100644 index bd61b157..00000000 --- a/src/spec/stub/rails61/config/master.key +++ /dev/null @@ -1 +0,0 @@ -41965057759dc9068cf6c6ee8a971b61 \ No newline at end of file diff --git a/src/spec/stub/rails61/config/routes.rb b/src/spec/stub/rails61/config/routes.rb deleted file mode 100644 index c06383a1..00000000 --- a/src/spec/stub/rails61/config/routes.rb +++ /dev/null @@ -1,3 +0,0 @@ -Rails.application.routes.draw do - # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html -end diff --git a/src/spec/stub/rails61/public/robots.txt b/src/spec/stub/rails61/public/robots.txt deleted file mode 100644 index c19f78ab..00000000 --- a/src/spec/stub/rails61/public/robots.txt +++ /dev/null @@ -1 +0,0 @@ -# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file