Skip to content

Match config.load_defaults Version to Rails Version #3496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aaronskiba merged 5 commits into from
Apr 10, 2025
Merged

Match config.load_defaults Version to Rails Version #3496

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d669ac5
Add `coder :YAML` to `serialize` for Rails 7.1
aaronskiba Mar 26, 2025
f26b54f
Match `config.load_defaults` to Rails (v7.1)
aaronskiba Mar 26, 2025
76cc7eb
Update CHANGELOG.md
aaronskiba Mar 26, 2025
1226803
Remove unused `serialize :prefs` from User model
aaronskiba Apr 3, 2025
325b49f
Merge branch 'development' into aaron/config.load_defaults-7.1
aaronskiba Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions app/models/condition.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
class Condition < ApplicationRecord
belongs_to :question
enum action_type: %i[remove add_webhook]
serialize :option_list, type: Array
serialize :remove_data, type: Array
serialize :option_list, type: Array, coder: YAML
serialize :remove_data, type: Array, coder: YAML
serialize :webhook_data, coder: JSON

# Sort order: Number ASC
Expand Down
2 changes: 1 addition & 1 deletion app/models/user.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class User < ApplicationRecord

##
# User Notification Preferences
serialize :prefs, type: Hash
serialize :prefs, type: Hash, coder: YAML

@aaronskiba aaronskiba Apr 3, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @briri, does it look like this code could be removed entirely? I can see an older migration that moved prefs to its own table, so I'm thinking this code no longer serves a purpose (https://github.com/DMPRoadmap/roadmap/blob/main/db/migrate/20170712084314_move_prefs_to_table.rb).

@briri briri Apr 3, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I think so. There's a Pref model now and separate table and I don't see anywhere where user.prefs is being accessed


# default user language to the default language
attribute :language_id, :integer, default: -> { Language.default&.id }
Expand Down
2 changes: 1 addition & 1 deletion config/application.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down