Skip to content

Commit 41944ec

Browse files
authored
Merge branch 'main' into patch-1
2 parents cb5ddbd + 360f57d commit 41944ec

30 files changed

+870
-846
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
test:
3030
name: test (Rails ${{ matrix.rails_version }}, Ruby ${{ matrix.ruby_version }})
3131
runs-on: ubuntu-latest
32+
continue-on-error: ${{ matrix.ruby_version == 'head' }}
3233
strategy:
3334
fail-fast: false
3435
matrix:

Appraisals

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ appraise "rails-8.1" do
4545
end
4646

4747
appraise "rails-main" do
48+
ruby "4.0.0.dev"
49+
4850
gem "rack", git: "https://github.com/rack/rack", ref: "8a4475a9f416a72e5b02bd7817e4a8ed684f29b0"
4951
gem "rails", github: "rails/rails", branch: "main"
5052

Gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ group :development, :test do
1616
gem "appraisal-run", "~> 1.1"
1717
gem "benchmark-ips", "~> 2"
1818
gem "better_html"
19-
gem "bundler", "~> 2"
19+
gem "bundler"
2020
gem "capybara", "~> 3"
2121
gem "cuprite"
2222
gem "dry-initializer", require: true
@@ -27,9 +27,10 @@ group :development, :test do
2727
gem "method_source", "~> 1"
2828
gem "minitest", "~> 5"
2929
gem "propshaft", "~> 1"
30-
gem "puma", "~> 6"
30+
gem "puma", ">= 6"
3131
gem "rake", "~> 13"
3232
gem "rails-dom-testing", "~> 2.3.0"
33+
gem "reactionview"
3334
gem "redis"
3435
gem "rspec-rails"
3536
gem "rubocop-md", "~> 2"

0 commit comments

Comments
 (0)