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

Upgrade Rails to v7.2 #915

Merged
merged 4 commits into from
Nov 13, 2024
Merged

Upgrade Rails to v7.2 #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
698d957
upgrade rails to 7.2
ezekg Nov 11, 2024
09ab2b4
hack: fix modifying unmodifiable/loaded relation
ezekg Nov 12, 2024
58e60b0
add deprecation for v1 tokens
ezekg Nov 12, 2024
86bd9d6
add jit v1 token rehashing
ezekg Nov 12, 2024
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
10 changes: 5 additions & 5 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
source 'https://rubygems.org'
ruby '3.3.6'

gem 'rails', '~> 7.1.4.1'
gem 'rails', '~> 7.2.2'
gem 'pg', '~> 1.3.4'
gem 'puma', '~> 6.4.3'
gem 'bcrypt', '~> 3.1.7'
gem 'bcrypt', '3.1.17'
gem 'rack', '~> 2.2.8.1'
gem 'rack-timeout', require: 'rack/timeout/base'
unless ENV.key?('NO_RACK_ATTACK')
Expand Down Expand Up @@ -51,8 +51,8 @@ gem 'kaminari', '~> 1.2.0'

# Postgres/DB extensions
gem 'active_record_union'
gem 'active_record_distinct_on', '~> 1.6'
gem 'activerecord_where_assoc', '~> 1.1.4'
gem 'active_record_distinct_on', '~> 1.7'
gem 'activerecord_where_assoc', '~> 1.2'
gem 'ar_lazy_preload', '~> 2.0'
gem 'strong_migrations'
gem 'verbose_migrations'
Expand Down Expand Up @@ -120,7 +120,7 @@ group :development, :test do
gem 'byebug', platform: :mri
gem 'dotenv-rails'
gem 'timecop', '~> 0.9.5'
gem 'bullet', '~> 7.1.6'
gem 'bullet', '~> 7.2'
gem 'parallel_tests', '~> 4.2.1'
gem 'cuke_modeler', '~> 3.19' # for running `parallel_test --group-by scenarios`
gem 'faker', '~> 2.20.0'
Expand Down
174 changes: 87 additions & 87 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,86 +15,83 @@ GEM
concurrent-ruby (~> 1.0)
action_policy (0.6.3)
ruby-next-core (>= 0.14.0)
actioncable (7.1.4.1)
actionpack (= 7.1.4.1)
activesupport (= 7.1.4.1)
actioncable (7.2.2)
actionpack (= 7.2.2)
activesupport (= 7.2.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.4.1)
actionpack (= 7.1.4.1)
activejob (= 7.1.4.1)
activerecord (= 7.1.4.1)
activestorage (= 7.1.4.1)
activesupport (= 7.1.4.1)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.4.1)
actionpack (= 7.1.4.1)
actionview (= 7.1.4.1)
activejob (= 7.1.4.1)
activesupport (= 7.1.4.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
actionmailbox (7.2.2)
actionpack (= 7.2.2)
activejob (= 7.2.2)
activerecord (= 7.2.2)
activestorage (= 7.2.2)
activesupport (= 7.2.2)
mail (>= 2.8.0)
actionmailer (7.2.2)
actionpack (= 7.2.2)
actionview (= 7.2.2)
activejob (= 7.2.2)
activesupport (= 7.2.2)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.1.4.1)
actionview (= 7.1.4.1)
activesupport (= 7.1.4.1)
actionpack (7.2.2)
actionview (= 7.2.2)
activesupport (= 7.2.2)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack (>= 2.2.4, < 3.2)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.4.1)
actionpack (= 7.1.4.1)
activerecord (= 7.1.4.1)
activestorage (= 7.1.4.1)
activesupport (= 7.1.4.1)
useragent (~> 0.16)
actiontext (7.2.2)
actionpack (= 7.2.2)
activerecord (= 7.2.2)
activestorage (= 7.2.2)
activesupport (= 7.2.2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.4.1)
activesupport (= 7.1.4.1)
actionview (7.2.2)
activesupport (= 7.2.2)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
active_record_distinct_on (1.6.0)
activerecord (>= 6.1, < 7.2)
active_record_distinct_on (1.7.0)
activerecord (>= 6.1, < 7.3)
active_record_union (1.3.0)
activerecord (>= 4.0)
activejob (7.1.4.1)
activesupport (= 7.1.4.1)
activejob (7.2.2)
activesupport (= 7.2.2)
globalid (>= 0.3.6)
activemodel (7.1.4.1)
activesupport (= 7.1.4.1)
activerecord (7.1.4.1)
activemodel (= 7.1.4.1)
activesupport (= 7.1.4.1)
activemodel (7.2.2)
activesupport (= 7.2.2)
activerecord (7.2.2)
activemodel (= 7.2.2)
activesupport (= 7.2.2)
timeout (>= 0.4.0)
activerecord_where_assoc (1.1.4)
activerecord_where_assoc (1.2.0)
activerecord (>= 4.1.0)
activestorage (7.1.4.1)
actionpack (= 7.1.4.1)
activejob (= 7.1.4.1)
activerecord (= 7.1.4.1)
activesupport (= 7.1.4.1)
activestorage (7.2.2)
actionpack (= 7.2.2)
activejob (= 7.2.2)
activerecord (= 7.2.2)
activesupport (= 7.2.2)
marcel (~> 1.0)
activesupport (7.1.4.1)
activesupport (7.2.2)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
anbt-sql-formatter (0.1.0)
Expand All @@ -120,9 +117,10 @@ GEM
statsd-ruby (~> 1.1)
base64 (0.2.0)
bcrypt (3.1.17)
benchmark (0.4.0)
bigdecimal (3.1.8)
builder (3.3.0)
bullet (7.1.6)
bullet (7.2.0)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
byebug (11.1.3)
Expand Down Expand Up @@ -193,7 +191,7 @@ GEM
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
date (3.3.4)
date (3.4.0)
diff-lcs (1.5.0)
dotenv (2.7.6)
dotenv-rails (2.7.6)
Expand Down Expand Up @@ -284,12 +282,13 @@ GEM
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.1)
lograge (0.12.0)
actionpack (>= 4)
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.22.0)
loofah (2.23.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
Expand All @@ -312,8 +311,7 @@ GEM
multi_test (0.1.2)
multi_xml (0.7.1)
bigdecimal (~> 3.1)
mutex_m (0.2.0)
net-imap (0.5.0)
net-imap (0.5.1)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -322,7 +320,7 @@ GEM
timeout
net-smtp (0.5.0)
net-protocol
nio4r (2.7.3)
nio4r (2.7.4)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
Expand All @@ -341,7 +339,7 @@ GEM
premailer-rails (1.11.1)
actionmailer (>= 3)
premailer (~> 1.7, >= 1.7.9)
psych (5.1.2)
psych (5.2.0)
stringio
public_suffix (4.0.6)
puma (6.4.3)
Expand All @@ -358,23 +356,23 @@ GEM
rack-test (2.1.0)
rack (>= 1.3)
rack-timeout (0.6.0)
rackup (1.0.0)
rackup (1.0.1)
rack (< 3)
webrick
rails (7.1.4.1)
actioncable (= 7.1.4.1)
actionmailbox (= 7.1.4.1)
actionmailer (= 7.1.4.1)
actionpack (= 7.1.4.1)
actiontext (= 7.1.4.1)
actionview (= 7.1.4.1)
activejob (= 7.1.4.1)
activemodel (= 7.1.4.1)
activerecord (= 7.1.4.1)
activestorage (= 7.1.4.1)
activesupport (= 7.1.4.1)
rails (7.2.2)
actioncable (= 7.2.2)
actionmailbox (= 7.2.2)
actionmailer (= 7.2.2)
actionpack (= 7.2.2)
actiontext (= 7.2.2)
actionview (= 7.2.2)
activejob (= 7.2.2)
activemodel (= 7.2.2)
activerecord (= 7.2.2)
activestorage (= 7.2.2)
activesupport (= 7.2.2)
bundler (>= 1.15.0)
railties (= 7.1.4.1)
railties (= 7.2.2)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
Expand All @@ -385,10 +383,10 @@ GEM
rails-pattern_matching (0.2.0)
activemodel
activerecord
railties (7.1.4.1)
actionpack (= 7.1.4.1)
activesupport (= 7.1.4.1)
irb
railties (7.2.2)
actionpack (= 7.2.2)
activesupport (= 7.2.2)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
Expand All @@ -403,7 +401,7 @@ GEM
redis-client (0.22.1)
connection_pool
regexp_parser (2.2.1)
reline (0.5.10)
reline (0.5.11)
io-console (~> 0.5)
request_migrations (1.1.1)
rails (>= 6.0)
Expand Down Expand Up @@ -443,6 +441,7 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
securerandom (0.3.2)
semverse (3.0.2)
sendgrid-actionmailer (3.2.0)
mail (~> 2.7)
Expand Down Expand Up @@ -481,7 +480,7 @@ GEM
statement_timeout (1.0.0)
rails (>= 6.0)
statsd-ruby (1.5.0)
stringio (3.1.1)
stringio (3.1.2)
stripe (5.48.0)
strong_migrations (1.8.0)
activerecord (>= 5.2)
Expand All @@ -493,7 +492,7 @@ GEM
thor (1.3.2)
tilt (2.0.10)
timecop (0.9.5)
timeout (0.4.1)
timeout (0.4.2)
tracer (0.1.1)
typed_params (1.2.5)
rails (>= 6.0)
Expand All @@ -503,35 +502,36 @@ GEM
union_of (1.0.0)
rails (>= 7.0)
uri (0.12.2)
useragent (0.16.10)
verbose_migrations (1.0.1)
rails (>= 6.0)
webmock (3.14.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.2)
webrick (1.9.0)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.7.0)
zeitwerk (2.7.1)

PLATFORMS
ruby

DEPENDENCIES
aasm (~> 5.0.3)
action_policy (~> 0.6.3)
active_record_distinct_on (~> 1.6)
active_record_distinct_on (~> 1.7)
active_record_union
activerecord_where_assoc (~> 1.1.4)
activerecord_where_assoc (~> 1.2)
anbt-sql-formatter
ar_lazy_preload (~> 2.0)
aws-sdk-s3 (~> 1)
barnes
bcrypt (~> 3.1.7)
bullet (~> 7.1.6)
bcrypt (= 3.1.17)
bullet (~> 7.2)
byebug
compact_index
cucumber-rails (~> 2.5)
Expand Down Expand Up @@ -569,7 +569,7 @@ DEPENDENCIES
rack-attack (~> 6.6)
rack-cors
rack-timeout
rails (~> 7.1.4.1)
rails (~> 7.2.2)
rails-pattern_matching
redis (~> 4.7.1)
request_migrations (~> 1.1)
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/api/v1/products/relationships/licenses_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def show
def set_product
scoped_products = authorized_scope(current_account.products)

Current.resource = @product = FindByAliasService.call(
@product = Current.resource = FindByAliasService.call(
scoped_products,
id: params[:product_id],
aliases: :code,
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/api/v1/products/relationships/machines_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def show
def set_product
scoped_products = authorized_scope(current_account.products)

Current.resource = @product = FindByAliasService.call(
@product = Current.resource = FindByAliasService.call(
scoped_products,
id: params[:product_id],
aliases: :code,
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/api/v1/products/relationships/policies_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def show
def set_product
scoped_products = authorized_scope(current_account.products)

Current.resource = @product = FindByAliasService.call(
@product = Current.resource = FindByAliasService.call(
scoped_products,
id: params[:product_id],
aliases: :code,
Expand Down
Loading