Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ jobs:
rails_version: "8.0"
- ruby_version: "4.0"
rails_version: "8.1"
- ruby_version: "head"
- ruby_version: "4.0"
rails_version: "main"
- ruby_version: "head"
rails_version: "main_head"
env:
BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails_version }}.gemfile
steps:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
/test/tmp/*
/.yardoc
.DS_Store
/log/*

## Specific to RubyMotion:
.dat*
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby 4.0.1
ruby 4.1-dev
12 changes: 12 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,18 @@ appraise "rails-8.1" do
end

appraise "rails-main" do
ruby "~> 4.0"

gem "rack", git: "https://github.com/rack/rack", ref: "8a4475a9f416a72e5b02bd7817e4a8ed684f29b0"
gem "rails", github: "rails/rails", branch: "main"

group :development, :test do
gem "turbo-rails", "~> 2"
gem "rspec-rails", "~> 8"
end
end

appraise "rails-main_head" do
ruby "4.1.0.dev"

gem "rack", git: "https://github.com/rack/rack", ref: "8a4475a9f416a72e5b02bd7817e4a8ed684f29b0"
Expand Down
6 changes: 6 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ GEM
matrix (0.4.3)
method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.9)
minitest (6.0.6)
drb (~> 2.0)
prism (~> 1.5)
Expand All @@ -198,6 +199,9 @@ GEM
net-smtp (0.5.1)
net-protocol
nio4r (2.7.5)
nokogiri (1.19.3)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.19.3-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.19.3-aarch64-linux-musl)
Expand Down Expand Up @@ -529,13 +533,15 @@ CHECKSUMS
matrix (0.4.3) sha256=a0d5ab7ddcc1973ff690ab361b67f359acbb16958d1dc072b8b956a286564c5b
method_source (1.1.0) sha256=181301c9c45b731b4769bc81e8860e72f9161ad7d66dd99103c9ab84f560f5c5
mini_mime (1.1.5) sha256=8681b7e2e4215f2a159f9400b5816d85e9d8c6c6b491e96a12797e798f8bccef
mini_portile2 (2.8.9) sha256=0cd7c7f824e010c072e33f68bc02d85a00aeb6fce05bb4819c03dfd3c140c289
minitest (6.0.6) sha256=153ea36d1d987a62942382b61075745042a2b3123b1cd48f4c3675af9cc7d6f1
minitest-mock (5.27.0) sha256=7040ed7185417a966920987eaa6eaf1be4ea1fc5b25bb03ff4703f98564a55b0
net-imap (0.6.4) sha256=9a5598c67a3022c284d98430ef1d4948e7dbdb62596f61081ea8ca933270a02b
net-pop (0.1.2) sha256=848b4e982013c15b2f0382792268763b748cce91c9e91e36b0f27ed26420dff3
net-protocol (0.2.2) sha256=aa73e0cba6a125369de9837b8d8ef82a61849360eba0521900e2c3713aa162a8
net-smtp (0.5.1) sha256=ed96a0af63c524fceb4b29b0d352195c30d82dd916a42f03c62a3a70e5b70736
nio4r (2.7.5) sha256=6c90168e48fb5f8e768419c93abb94ba2b892a1d0602cb06eef16d8b7df1dca1
nokogiri (1.19.3) sha256=78312cbac32a40c812780d9678221b79d51288eec00054c1a8d15f7ce05960e8
nokogiri (1.19.3-aarch64-linux-gnu) sha256=46b89e5d7b9e844c2ee360794240c6ea2a4e6fa0c5892a4ed487db621224b639
nokogiri (1.19.3-aarch64-linux-musl) sha256=8392dfdcd21be7a94dbbe9ccc138dea01b97b24cb2dc02a114ca98bfb1d9a0b7
nokogiri (1.19.3-arm-linux-gnu) sha256=3919d5ffc334ad778a4a9eb88fda7dcb8b1fb58c8a52ac640c6dcd2f038e774f
Expand Down
4 changes: 4 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ nav_order: 6

## main

* Update `render_in` signature to accept `**_` for compatibility with Rails [#50623](https://github.com/rails/rails/pull/50623).

*Joel Hawksley*

* Fix translation scope resolution in nested lambda-backed slots. Relative `t(".key")` calls inside lambda-backed slots were resolving against an intermediate component's scope instead of the original partial's scope where the block was defined.

*Artin Boghosian*
Expand Down
9 changes: 6 additions & 3 deletions gemfiles/rails_7.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

ruby "~> 3.2.0"
ruby "~> 3.2"

gem "rails", "~> 7.1.0"

Expand All @@ -17,11 +17,13 @@ group :development, :test do
gem "cuprite"
gem "dry-initializer", require: true
gem "erb_lint"
gem "haml", "~> 6"
gem "haml", "~> 7"
gem "jbuilder", "~> 2"
gem "m", "~> 1"
gem "method_source", "~> 1"
gem "minitest", "~> 5"
gem "minitest", "~> 6"
gem "minitest-mock"
gem "nokogiri", "1.19.3"
gem "propshaft", "~> 1"
gem "puma", ">= 6"
gem "rake", "~> 13"
Expand All @@ -40,6 +42,7 @@ group :development, :test do
gem "turbo-rails", "~> 1"
gem "warning"
gem "yard-activesupport-concern", "< 1"
gem "yard-lint", "~> 1.5"
gem "yard", "< 1"
end

Expand Down
33 changes: 21 additions & 12 deletions gemfiles/rails_7.1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ GEM
websocket-driver (~> 0.7)
globalid (1.3.0)
activesupport (>= 6.1)
haml (6.4.0)
haml (7.2.0)
temple (>= 0.8.2)
thor
tilt
Expand Down Expand Up @@ -190,7 +190,10 @@ GEM
matrix (0.4.3)
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.26.2)
minitest (6.0.6)
drb (~> 2.0)
prism (~> 1.5)
minitest-mock (5.27.0)
mutex_m (0.3.0)
net-imap (0.5.12)
date
Expand All @@ -202,21 +205,21 @@ GEM
net-smtp (0.5.1)
net-protocol
nio4r (2.7.5)
nokogiri (1.18.10-aarch64-linux-gnu)
nokogiri (1.19.3-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.10-aarch64-linux-musl)
nokogiri (1.19.3-aarch64-linux-musl)
racc (~> 1.4)
nokogiri (1.18.10-arm-linux-gnu)
nokogiri (1.19.3-arm-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.10-arm-linux-musl)
nokogiri (1.19.3-arm-linux-musl)
racc (~> 1.4)
nokogiri (1.18.10-arm64-darwin)
nokogiri (1.19.3-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.10-x86_64-darwin)
nokogiri (1.19.3-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.18.10-x86_64-linux-gnu)
nokogiri (1.19.3-x86_64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.10-x86_64-linux-musl)
nokogiri (1.19.3-x86_64-linux-musl)
racc (~> 1.4)
parallel (1.27.0)
parser (3.3.10.0)
Expand Down Expand Up @@ -413,6 +416,9 @@ GEM
yard (0.9.37)
yard-activesupport-concern (0.0.1)
yard (>= 0.8)
yard-lint (1.5.1)
yard (~> 0.9)
zeitwerk (~> 2.6)
zeitwerk (2.7.3)

PLATFORMS
Expand All @@ -439,11 +445,13 @@ DEPENDENCIES
cuprite
dry-initializer
erb_lint
haml (~> 6)
haml (~> 7)
jbuilder (~> 2)
m (~> 1)
method_source (~> 1)
minitest (~> 5)
minitest (~> 6)
minitest-mock
nokogiri (= 1.19.3)
propshaft (~> 1)
puma (>= 6)
rails (~> 7.1.0)
Expand All @@ -465,6 +473,7 @@ DEPENDENCIES
warning
yard (< 1)
yard-activesupport-concern (< 1)
yard-lint (~> 1.5)

RUBY VERSION
ruby 3.2.8p263
Expand Down
9 changes: 6 additions & 3 deletions gemfiles/rails_7.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

ruby "~> 3.3.0"
ruby "~> 3.3"

gem "rails", "~> 7.2.0"

Expand All @@ -17,11 +17,13 @@ group :development, :test do
gem "cuprite"
gem "dry-initializer", require: true
gem "erb_lint"
gem "haml", "~> 6"
gem "haml", "~> 7"
gem "jbuilder", "~> 2"
gem "m", "~> 1"
gem "method_source", "~> 1"
gem "minitest", "~> 5"
gem "minitest", "~> 6"
gem "minitest-mock"
gem "nokogiri", "1.19.3"
gem "propshaft", "~> 1"
gem "puma", ">= 6"
gem "rake", "~> 13"
Expand All @@ -40,6 +42,7 @@ group :development, :test do
gem "turbo-rails", "~> 2"
gem "warning"
gem "yard-activesupport-concern", "< 1"
gem "yard-lint", "~> 1.5"
gem "yard", "< 1"
end

Expand Down
33 changes: 21 additions & 12 deletions gemfiles/rails_7.2.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ GEM
websocket-driver (~> 0.7)
globalid (1.3.0)
activesupport (>= 6.1)
haml (6.4.0)
haml (7.2.0)
temple (>= 0.8.2)
thor
tilt
Expand Down Expand Up @@ -184,7 +184,10 @@ GEM
matrix (0.4.3)
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.26.2)
minitest (6.0.6)
drb (~> 2.0)
prism (~> 1.5)
minitest-mock (5.27.0)
net-imap (0.5.12)
date
net-protocol
Expand All @@ -195,21 +198,21 @@ GEM
net-smtp (0.5.1)
net-protocol
nio4r (2.7.5)
nokogiri (1.18.10-aarch64-linux-gnu)
nokogiri (1.19.3-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.10-aarch64-linux-musl)
nokogiri (1.19.3-aarch64-linux-musl)
racc (~> 1.4)
nokogiri (1.18.10-arm-linux-gnu)
nokogiri (1.19.3-arm-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.10-arm-linux-musl)
nokogiri (1.19.3-arm-linux-musl)
racc (~> 1.4)
nokogiri (1.18.10-arm64-darwin)
nokogiri (1.19.3-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.10-x86_64-darwin)
nokogiri (1.19.3-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.18.10-x86_64-linux-gnu)
nokogiri (1.19.3-x86_64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.10-x86_64-linux-musl)
nokogiri (1.19.3-x86_64-linux-musl)
racc (~> 1.4)
parallel (1.27.0)
parser (3.3.10.0)
Expand Down Expand Up @@ -406,6 +409,9 @@ GEM
yard (0.9.37)
yard-activesupport-concern (0.0.1)
yard (>= 0.8)
yard-lint (1.5.1)
yard (~> 0.9)
zeitwerk (~> 2.6)
zeitwerk (2.7.3)

PLATFORMS
Expand All @@ -432,11 +438,13 @@ DEPENDENCIES
cuprite
dry-initializer
erb_lint
haml (~> 6)
haml (~> 7)
jbuilder (~> 2)
m (~> 1)
method_source (~> 1)
minitest (~> 5)
minitest (~> 6)
minitest-mock
nokogiri (= 1.19.3)
propshaft (~> 1)
puma (>= 6)
rails (~> 7.2.0)
Expand All @@ -458,6 +466,7 @@ DEPENDENCIES
warning
yard (< 1)
yard-activesupport-concern (< 1)
yard-lint (~> 1.5)

RUBY VERSION
ruby 3.3.8p144
Expand Down
7 changes: 5 additions & 2 deletions gemfiles/rails_8.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ group :development, :test do
gem "cuprite"
gem "dry-initializer", require: true
gem "erb_lint"
gem "haml", "~> 6"
gem "haml", "~> 7"
gem "jbuilder", "~> 2"
gem "m", "~> 1"
gem "method_source", "~> 1"
gem "minitest", "~> 5"
gem "minitest", "~> 6"
gem "minitest-mock"
gem "nokogiri", "1.19.3"
gem "propshaft", "~> 1"
gem "puma", ">= 6"
gem "rake", "~> 13"
Expand All @@ -40,6 +42,7 @@ group :development, :test do
gem "turbo-rails", "~> 2"
gem "warning"
gem "yard-activesupport-concern", "< 1"
gem "yard-lint", "~> 1.5"
gem "yard", "< 1"
end

Expand Down
Loading
Loading