Skip to content
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

AO3-6893 Upgrade gems and configs to Rails 7.1.x #5039

Merged
merged 12 commits into from
Feb 15, 2025
Merged

AO3-6893 Upgrade gems and configs to Rails 7.1.x #5039

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b6a7d30
AO3-6893 Initial Rails upgrade
Bilka2 Jan 29, 2025
c2d1c7b
AO3-6893 Flipped config options and fixed deprecations
Bilka2 Jan 29, 2025
fce2bf4
Add Active Storage 7.1 changes to manual with_attached_* scopes
Bilka2 Jan 26, 2025
6c5a8bc
AO3-6893 Rubocop
Bilka2 Jan 29, 2025
e5fa7ee
AO3-6893 Enable active storage related n+1 tests
Bilka2 Feb 2, 2025
a28ec79
AO3-6893 Use departure for active_storage_blobs migration
Bilka2 Feb 3, 2025
0bf2a13
Merge branch 'master' into AO3-6893-rails-7-1-x
Bilka2 Feb 4, 2025
d646bf3
AO3-6893 Fix tests
Bilka2 Feb 4, 2025
3df6088
Doggy
Bilka2 Feb 4, 2025
a989f8d
AO3-6893 Minor fixes
Bilka2 Feb 6, 2025
a354360
Merge branch 'master' into AO3-6893-rails-7-1-x
Bilka2 Feb 13, 2025
641e80a
Merge upstream
brianjaustin Feb 15, 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
1 change: 1 addition & 0 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ Metrics/PerceivedComplexity:
Migration/LargeTableSchemaUpdate:
Tables:
- abuse_reports
- active_storage_blobs
- admin_activities
- audits
- bookmarks
Expand Down
8 changes: 3 additions & 5 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem 'test-unit', '~> 3.2'

gem 'bundler'

gem "rails", "~> 7.0.8"
gem "rails", "~> 7.1"
gem "rails-i18n"
gem "rack", "~> 2.2"
gem "sprockets", "< 4"
Expand Down Expand Up @@ -83,9 +83,7 @@ gem 'timeliness'
gem 'google_visualr', git: 'https://github.com/winston/google_visualr'

# Globalize for translations
# Must use master branch and activemodel-serializers-xml for Rails 5 upgrade
gem 'globalize', git: 'https://github.com/globalize/globalize'
gem 'activemodel-serializers-xml'
gem "globalize", "~> 7.0"

# Add a clean notifier that shows we are on dev or test
gem 'rack-dev-mark', '>=0.7.8'
Expand All @@ -108,7 +106,7 @@ gem 'kgio', '2.10.0'
gem "marcel", "1.0.2"

# Library for helping run pt-online-schema-change commands:
gem "departure", "~> 6.5"
gem "departure", "~> 6.7"

gem "rack-timeout"
gem "puma_worker_killer"
Expand Down
Loading
Loading