Skip to content

Commit b751e8e

Browse files
authored
Merge branch 'main' into patch-1
2 parents 00ee3a2 + 8a131b6 commit b751e8e

31 files changed

+1230
-166
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ jobs:
3939
rails_version: "7.2"
4040
- ruby_version: "3.4"
4141
rails_version: "8.0"
42+
- ruby_version: "3.4"
43+
rails_version: "8.1"
4244
- ruby_version: "head"
4345
rails_version: "main"
4446
env:

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby 3.4.3
1+
ruby 3.4.7

Appraisals

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,17 @@ appraise "rails-8.0" do
3333
end
3434
end
3535

36+
appraise "rails-8.1" do
37+
ruby "~> 3.4.0"
38+
39+
gem "rails", "~> 8.1.0"
40+
41+
group :development, :test do
42+
gem "turbo-rails", "~> 2"
43+
gem "rspec-rails", "~> 8"
44+
end
45+
end
46+
3647
appraise "rails-main" do
3748
gem "rack", git: "https://github.com/rack/rack", ref: "8a4475a9f416a72e5b02bd7817e4a8ed684f29b0"
3849
gem "rails", github: "rails/rails", branch: "main"

Gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ruby ruby_version
1313
group :development, :test do
1414
gem "allocation_stats"
1515
gem "appraisal", "~> 2"
16+
gem "appraisal-run", "~> 1.1"
1617
gem "benchmark-ips", "~> 2"
1718
gem "better_html"
1819
gem "bundler", "~> 2"
@@ -26,7 +27,7 @@ group :development, :test do
2627
gem "method_source", "~> 1"
2728
gem "minitest", "~> 5"
2829
gem "propshaft", "~> 1"
29-
gem "puma", "~> 6"
30+
gem "puma", ">= 6"
3031
gem "rake", "~> 13"
3132
gem "rails-dom-testing", "~> 2.3.0"
3233
gem "redis"
@@ -38,7 +39,7 @@ group :development, :test do
3839
gem "slim", "~> 5"
3940
gem "sprockets-rails", "~> 3"
4041
gem "standard", "~> 1"
41-
gem "tailwindcss-rails", "~> 2"
42+
gem "tailwindcss-rails", "~> 4"
4243
gem "turbo-rails"
4344
gem "warning"
4445
gem "yard-activesupport-concern", "< 1"

0 commit comments

Comments
 (0)