Browse Source
Upgrade to Rails 6
- Added listen gem because rails app:update failed without it
- Removes nsa gem because it requires activesupport < 6
Oddly, there's a newer version per GitHub that's not on RubyGems
that raises the requirement to < 7. But, we need a new release
before we can use that.
- Upgrade rails-i18n to v6, for Rails 6 compatibility
- Remove redis-rails since it requires Rails < 6, but we can just use
the regular Rails :redis_cache_store that was introduced in 5.2.
- Run `rails app:update`
- Had to weed through the `config/environments` changes to pick up
newly added settings, while not losing settings that were
intentionally configured
- This generated config/initializers/new_framework_defaults_6_0.rb.
The goal is to uncomment all of the settings in that file. Once
they're all uncommented, delete the file and edit
config/application.rb's load_defaults to be 6.0.
- force_ssl controller method is deprecated in favor of a Rails
config setting.
- bin/setup was generated by Rails
- Verbose query logging in development is really helpful. It shows
you what line of code caused a query to execute.
- Calling establish_connection after worker boot isn't necessary
with ActiveRecord anymore. ActiveRecord handles it gracefully.
- Rails generated a migration to add a foreign key for ActiveStorage.
Gab currently doesn't use ActiveStorage, and instead uses Paperclip
(since ActiveStorage didn't exist when Mastadon started). So, this
change isn't relevant to Gab.
- Added ` || ''` in the profiles controller, because I was unable
to save a change to a newly created profile. (This probably
explains the 500 error I received on prod Gab recently.)
develop
rubic0n
3 months ago
15 changed files with 306 additions and 163 deletions
Split View
Diff Options
-
+4 -4Gemfile
-
+134 -131Gemfile.lock
-
+0 -6app/controllers/application_controller.rb
-
+1 -1app/controllers/settings/profiles_controller.rb
-
+8 -6bin/setup
-
+10 -0config/cable.yml
-
+9 -1config/environments/development.rb
-
+33 -1config/environments/production.rb
-
+3 -0config/environments/test.rb
-
+53 -0config/initializers/new_framework_defaults_6_0.rb
-
+1 -1config/initializers/statsd.rb
-
+0 -6config/puma.rb
-
+34 -0config/storage.yml
-
+10 -0db/migrate/20210123050026_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb
-
+6 -6db/schema.rb
+ 4
- 4
Gemfile
View File
+ 134
- 131
Gemfile.lock
View File
+ 0
- 6
app/controllers/application_controller.rb
View File
+ 1
- 1
app/controllers/settings/profiles_controller.rb
View File
+ 8
- 6
bin/setup
View File
+ 10
- 0
config/cable.yml
View File
| @ -0,0 +1,10 @@ | |||
| development: | |||
| adapter: async | |||
| test: | |||
| adapter: test | |||
| production: | |||
| adapter: redis | |||
| url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> | |||
| channel_prefix: gab_social_production | |||
+ 9
- 1
config/environments/development.rb
View File
+ 33
- 1
config/environments/production.rb
View File
+ 3
- 0
config/environments/test.rb
View File
+ 53
- 0
config/initializers/new_framework_defaults_6_0.rb
View File
| @ -0,0 +1,53 @@ | |||
| # Be sure to restart your server when you modify this file. | |||
| # | |||
| # This file contains migration options to ease your Rails 6.0 upgrade. | |||
| # | |||
| # Once upgraded flip defaults one by one to migrate to the new default. | |||
| # | |||
| # Read the Guide for Upgrading Ruby on Rails for more info on each option. | |||
| # Don't force requests from old versions of IE to be UTF-8 encoded. | |||
| Rails.application.config.action_view.default_enforce_utf8 = false | |||
| # Embed purpose and expiry metadata inside signed and encrypted | |||
| # cookies for increased security. | |||
| # | |||
| # This option is not backwards compatible with earlier Rails versions. | |||
| # It's best enabled when your entire app is migrated and stable on 6.0. | |||
| # Rails.application.config.action_dispatch.use_cookies_with_metadata = true | |||
| # Change the return value of `ActionDispatch::Response#content_type` to Content-Type header without modification. | |||
| # Rails.application.config.action_dispatch.return_only_media_type_on_content_type = false | |||
| # Return false instead of self when enqueuing is aborted from a callback. | |||
| Rails.application.config.active_job.return_false_on_aborted_enqueue = true | |||
| # Send Active Storage analysis and purge jobs to dedicated queues. | |||
| Rails.application.config.active_storage.queues.analysis = :active_storage_analysis | |||
| Rails.application.config.active_storage.queues.purge = :active_storage_purge | |||
| # When assigning to a collection of attachments declared via `has_many_attached`, replace existing | |||
| # attachments instead of appending. Use #attach to add new attachments without replacing existing ones. | |||
| Rails.application.config.active_storage.replace_on_assign_to_many = true | |||
| # Use ActionMailer::MailDeliveryJob for sending parameterized and normal mail. | |||
| # | |||
| # The default delivery jobs (ActionMailer::Parameterized::DeliveryJob, ActionMailer::DeliveryJob), | |||
| # will be removed in Rails 6.1. This setting is not backwards compatible with earlier Rails versions. | |||
| # If you send mail in the background, job workers need to have a copy of | |||
| # MailDeliveryJob to ensure all delivery jobs are processed properly. | |||
| # Make sure your entire app is migrated and stable on 6.0 before using this setting. | |||
| Rails.application.config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob" | |||
| # Enable the same cache key to be reused when the object being cached of type | |||
| # `ActiveRecord::Relation` changes by moving the volatile information (max updated at and count) | |||
| # of the relation's cache key into the cache version to support recycling cache key. | |||
| Rails.application.config.active_record.collection_cache_versioning = true | |||
| # The Rails 6 default autoloader is Zeitwerk. Zeitwerk has specific expectations on where certain | |||
| # classes should be defined. It also requires that constants are not autoloaded in initializers. | |||
| # Enabling Zeitwerk would be good, but it'll take some work. Using the :classic autoloader gives | |||
| # us the same autoloading that Rails 5.2 had. | |||
| # Rails.application.config.autoloader = :zeitwerk | |||
| Rails.application.config.autoloader = :classic | |||
+ 1
- 1
config/initializers/statsd.rb
View File
+ 0
- 6
config/puma.rb
View File
+ 34
- 0
config/storage.yml
View File
| @ -0,0 +1,34 @@ | |||
| test: | |||
| service: Disk | |||
| root: <%= Rails.root.join("tmp/storage") %> | |||
| local: | |||
| service: Disk | |||
| root: <%= Rails.root.join("storage") %> | |||
| # Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) | |||
| # amazon: | |||
| # service: S3 | |||
| # access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> | |||
| # secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> | |||
| # region: us-east-1 | |||
| # bucket: your_own_bucket | |||
| # Remember not to checkin your GCS keyfile to a repository | |||
| # google: | |||
| # service: GCS | |||
| # project: your_project | |||
| # credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> | |||
| # bucket: your_own_bucket | |||
| # Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) | |||
| # microsoft: | |||
| # service: AzureStorage | |||
| # storage_account_name: your_account_name | |||
| # storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> | |||
| # container: your_container_name | |||
| # mirror: | |||
| # service: Mirror | |||
| # primary: local | |||
| # mirrors: [ amazon, google, microsoft ] | |||
+ 10
- 0
db/migrate/20210123050026_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb
View File
| @ -0,0 +1,10 @@ | |||
| # This migration comes from active_storage (originally 20180723000244) | |||
| class AddForeignKeyConstraintToActiveStorageAttachmentsForBlobId < ActiveRecord::Migration[6.0] | |||
| def up | |||
| return if foreign_key_exists?(:active_storage_attachments, column: :blob_id) | |||
| if table_exists?(:active_storage_blobs) | |||
| add_foreign_key :active_storage_attachments, :active_storage_blobs, column: :blob_id | |||
| end | |||
| end | |||
| end | |||