Merge pull request #3496 from DMPRoadmap/aaron/config.load_defaults-7.1

aaronskiba · web-flow · commit 3506e05df756 · 2025-04-10T09:24:27.000-06:00
Match `config.load_defaults` Version to Rails Version
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-- Updated app to Rails 7 [#3426](https://github.com/DMPRoadmap/roadmap/pull/3426)
+- Updated app to Rails 7 [#3426](https://github.com/DMPRoadmap/roadmap/pull/3426), [#3496](https://github.com/DMPRoadmap/roadmap/pull/3496)
 - Address Some Bullet Warnings / Optimise Mean Request Times [#3440](https://github.com/DMPRoadmap/roadmap/pull/3440)
 - Fix Flaky Tests / Optimize Checking of `plan.title` Within `spec/features/plans/exports_spec.rb` [#3451](https://github.com/DMPRoadmap/roadmap/pull/3451)
 - Refactor Plan.deep_copy(plan) [#3469](https://github.com/DMPRoadmap/roadmap/pull/3469)
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -68,10 +68,6 @@ class User < ApplicationRecord
          :rememberable, :trackable, :validatable, :omniauthable,
          omniauth_providers: %i[shibboleth orcid]
 
-  ##
-  # User Notification Preferences
-  serialize :prefs, type: Hash
-
   # default user language to the default language
   attribute :language_id, :integer, default: -> { Language.default&.id }
 
diff --git a/config/application.rb b/config/application.rb
@@ -14,7 +14,7 @@ module DMPRoadmap
   # DMPRoadmap application
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 7.0
+    config.load_defaults 7.1
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
