-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #794 from DFE-Digital/rails-7.2.0
Upgrade to Rails 7.2.1
- Loading branch information
Showing
10 changed files
with
204 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,4 +49,6 @@ | |
| config.action_mailer.delivery_method = :test | ||
| config.action_mailer.default_options = { from: "[email protected]" } | ||
| config.action_mailer.default_url_options = { host: "localhost", port: 3000 } | ||
|
|
||
| config.active_job.queue_adapter = :test | ||
| end | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| # Be sure to restart your server when you modify this file. | ||
|
|
||
| # Version of your assets, change this if you want to expire all your assets. | ||
| Rails.application.config.assets.version = "1.0" | ||
|
|
||
| # Add additional assets to the asset load path. | ||
| # Rails.application.config.assets.paths << Emoji.images_path |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| # Be sure to restart your server when you modify this file. | ||
| # | ||
| # This file eases your Rails 7.2 framework defaults upgrade. | ||
| # | ||
| # Uncomment each configuration one by one to switch to the new default. | ||
| # Once your application is ready to run with all new defaults, you can remove | ||
| # this file and set the `config.load_defaults` to `7.2`. | ||
| # | ||
| # Read the Guide for Upgrading Ruby on Rails for more info on each option. | ||
| # https://guides.rubyonrails.org/upgrading_ruby_on_rails.html | ||
|
|
||
| ### | ||
| # Controls whether Active Job's `#perform_later` and similar methods automatically defer | ||
| # the job queuing to after the current Active Record transaction is committed. | ||
| # | ||
| # Example: | ||
| # Topic.transaction do | ||
| # topic = Topic.create(...) | ||
| # NewTopicNotificationJob.perform_later(topic) | ||
| # end | ||
| # | ||
| # In this example, if the configuration is set to `:never`, the job will | ||
| # be enqueued immediately, even though the `Topic` hasn't been committed yet. | ||
| # Because of this, if the job is picked up almost immediately, or if the | ||
| # transaction doesn't succeed for some reason, the job will fail to find this | ||
| # topic in the database. | ||
| # | ||
| # If `enqueue_after_transaction_commit` is set to `:default`, the queue adapter | ||
| # will define the behaviour. | ||
| # | ||
| # Note: Active Job backends can disable this feature. This is generally done by | ||
| # backends that use the same database as Active Record as a queue, hence they | ||
| # don't need this feature. | ||
| #++ | ||
| # Rails.application.config.active_job.enqueue_after_transaction_commit = :default | ||
|
|
||
| ### | ||
| # Adds image/webp to the list of content types Active Storage considers as an image | ||
| # Prevents automatic conversion to a fallback PNG, and assumes clients support WebP, as they support gif, jpeg, and png. | ||
| # This is possible due to broad browser support for WebP, but older browsers and email clients may still not support | ||
| # WebP. Requires imagemagick/libvips built with WebP support. | ||
| #++ | ||
| # Rails.application.config.active_storage.web_image_content_types = %w[image/png image/jpeg image/gif image/webp] | ||
|
|
||
| ### | ||
| # Enable validation of migration timestamps. When set, an ActiveRecord::InvalidMigrationTimestampError | ||
| # will be raised if the timestamp prefix for a migration is more than a day ahead of the timestamp | ||
| # associated with the current time. This is done to prevent forward-dating of migration files, which can | ||
| # impact migration generation and other migration commands. | ||
| # | ||
| # Applications with existing timestamped migrations that do not adhere to the | ||
| # expected format can disable validation by setting this config to `false`. | ||
| #++ | ||
| # Rails.application.config.active_record.validate_migration_timestamps = true | ||
|
|
||
| ### | ||
| # Controls whether the PostgresqlAdapter should decode dates automatically with manual queries. | ||
| # | ||
| # Example: | ||
| # ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.select_value("select '2024-01-01'::date") #=> Date | ||
| # | ||
| # This query used to return a `String`. | ||
| #++ | ||
| # Rails.application.config.active_record.postgresql_adapter_decode_dates = true | ||
|
|
||
| ### | ||
| # Enables YJIT as of Ruby 3.3, to bring sizeable performance improvements. If you are | ||
| # deploying to a memory constrained environment you may want to set this to `false`. | ||
| #++ | ||
| # Rails.application.config.yjit = true |
22 changes: 22 additions & 0 deletions
22
db/migrate/20240822092517_add_service_name_to_active_storage_blobs.active_storage.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| # This migration comes from active_storage (originally 20190112182829) | ||
| class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0] | ||
| def up | ||
| return unless table_exists?(:active_storage_blobs) | ||
|
|
||
| unless column_exists?(:active_storage_blobs, :service_name) | ||
| add_column :active_storage_blobs, :service_name, :string | ||
|
|
||
| if (configured_service = ActiveStorage::Blob.service.name) | ||
| ActiveStorage::Blob.unscoped.update_all(service_name: configured_service) | ||
| end | ||
|
|
||
| change_column :active_storage_blobs, :service_name, :string, null: false | ||
| end | ||
| end | ||
|
|
||
| def down | ||
| return unless table_exists?(:active_storage_blobs) | ||
|
|
||
| remove_column :active_storage_blobs, :service_name | ||
| end | ||
| end |
27 changes: 27 additions & 0 deletions
27
db/migrate/20240822092518_create_active_storage_variant_records.active_storage.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| # This migration comes from active_storage (originally 20191206030411) | ||
| class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0] | ||
| def change | ||
| return unless table_exists?(:active_storage_blobs) | ||
|
|
||
| # Use Active Record's configured type for primary key | ||
| create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |t| | ||
| t.belongs_to :blob, null: false, index: false, type: blobs_primary_key_type | ||
| t.string :variation_digest, null: false | ||
|
|
||
| t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true | ||
| t.foreign_key :active_storage_blobs, column: :blob_id | ||
| end | ||
| end | ||
|
|
||
| private | ||
| def primary_key_type | ||
| config = Rails.configuration.generators | ||
| config.options[config.orm][:primary_key_type] || :primary_key | ||
| end | ||
|
|
||
| def blobs_primary_key_type | ||
| pkey_name = connection.primary_key(:active_storage_blobs) | ||
| pkey_column = connection.columns(:active_storage_blobs).find { |c| c.name == pkey_name } | ||
| pkey_column.bigint? ? :bigint : pkey_column.type | ||
| end | ||
| end |
8 changes: 8 additions & 0 deletions
8
db/migrate/20240822092519_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| # This migration comes from active_storage (originally 20211119233751) | ||
| class RemoveNotNullOnActiveStorageBlobsChecksum < ActiveRecord::Migration[6.0] | ||
| def change | ||
| return unless table_exists?(:active_storage_blobs) | ||
|
|
||
| change_column_null(:active_storage_blobs, :checksum, true) | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters