Skip to content
Merged
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
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ jobs:
test:
name: Test (${{ matrix.gemfile }})
runs-on: ubuntu-latest
# Rails main moves daily, so a red Gemfile.next job is a heads up, not a blocker
continue-on-error: ${{ matrix.gemfile == 'Gemfile.next' }}
strategy:
fail-fast: false
matrix:
Expand Down
10 changes: 7 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ gem "next_rails"

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
if next?
gem "rails", "~> 8.1.0"
gem "rails", github: "rails/rails", branch: "main"
else
gem "rails", "~> 8.0.0"
gem "rails", "~> 8.1.0"
end

# Application Dependencies
Expand Down Expand Up @@ -79,7 +79,11 @@ group :test do
gem "capybara", ">= 2.15"
gem "selenium-webdriver"
gem "webdrivers"
gem "rspec-rails"
if next?
gem "rspec-rails", github: "rspec/rspec-rails", branch: "main"
else
gem "rspec-rails"
end
end

group :development, :test do
Expand Down
114 changes: 58 additions & 56 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,72 +1,75 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (8.0.5.2)
actionpack (= 8.0.5.2)
activesupport (= 8.0.5.2)
action_text-trix (2.1.19)
railties
actioncable (8.1.4.1)
actionpack (= 8.1.4.1)
activesupport (= 8.1.4.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (8.0.5.2)
actionpack (= 8.0.5.2)
activejob (= 8.0.5.2)
activerecord (= 8.0.5.2)
activestorage (= 8.0.5.2)
activesupport (= 8.0.5.2)
actionmailbox (8.1.4.1)
actionpack (= 8.1.4.1)
activejob (= 8.1.4.1)
activerecord (= 8.1.4.1)
activestorage (= 8.1.4.1)
activesupport (= 8.1.4.1)
mail (>= 2.8.0)
actionmailer (8.0.5.2)
actionpack (= 8.0.5.2)
actionview (= 8.0.5.2)
activejob (= 8.0.5.2)
activesupport (= 8.0.5.2)
actionmailer (8.1.4.1)
actionpack (= 8.1.4.1)
actionview (= 8.1.4.1)
activejob (= 8.1.4.1)
activesupport (= 8.1.4.1)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (8.0.5.2)
actionview (= 8.0.5.2)
activesupport (= 8.0.5.2)
actionpack (8.1.4.1)
actionview (= 8.1.4.1)
activesupport (= 8.1.4.1)
nokogiri (>= 1.8.5)
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
actiontext (8.0.5.2)
actionpack (= 8.0.5.2)
activerecord (= 8.0.5.2)
activestorage (= 8.0.5.2)
activesupport (= 8.0.5.2)
actiontext (8.1.4.1)
action_text-trix (~> 2.1.15)
actionpack (= 8.1.4.1)
activerecord (= 8.1.4.1)
activestorage (= 8.1.4.1)
activesupport (= 8.1.4.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (8.0.5.2)
activesupport (= 8.0.5.2)
actionview (8.1.4.1)
activesupport (= 8.1.4.1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6, >= 1.7.2)
activejob (8.0.5.2)
activesupport (= 8.0.5.2)
activejob (8.1.4.1)
activesupport (= 8.1.4.1)
globalid (>= 0.3.6)
activemodel (8.0.5.2)
activesupport (= 8.0.5.2)
activerecord (8.0.5.2)
activemodel (= 8.0.5.2)
activesupport (= 8.0.5.2)
activemodel (8.1.4.1)
activesupport (= 8.1.4.1)
activerecord (8.1.4.1)
activemodel (= 8.1.4.1)
activesupport (= 8.1.4.1)
timeout (>= 0.4.0)
activestorage (8.0.5.2)
actionpack (= 8.0.5.2)
activejob (= 8.0.5.2)
activerecord (= 8.0.5.2)
activesupport (= 8.0.5.2)
activestorage (8.1.4.1)
actionpack (= 8.1.4.1)
activejob (= 8.1.4.1)
activerecord (= 8.1.4.1)
activesupport (= 8.1.4.1)
marcel (~> 1.0)
activesupport (8.0.5.2)
activesupport (8.1.4.1)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
json
logger (>= 1.4.2)
minitest (>= 5.1)
securerandom (>= 0.3)
Expand All @@ -81,7 +84,6 @@ GEM
version_gem (~> 1.1, >= 1.1.16)
base64 (0.3.0)
bcrypt (3.1.22)
benchmark (0.5.0)
bigdecimal (4.1.3)
bindex (0.8.1)
bootsnap (1.13.0)
Expand Down Expand Up @@ -329,20 +331,20 @@ GEM
rackup (1.0.1)
rack (< 3)
webrick
rails (8.0.5.2)
actioncable (= 8.0.5.2)
actionmailbox (= 8.0.5.2)
actionmailer (= 8.0.5.2)
actionpack (= 8.0.5.2)
actiontext (= 8.0.5.2)
actionview (= 8.0.5.2)
activejob (= 8.0.5.2)
activemodel (= 8.0.5.2)
activerecord (= 8.0.5.2)
activestorage (= 8.0.5.2)
activesupport (= 8.0.5.2)
rails (8.1.4.1)
actioncable (= 8.1.4.1)
actionmailbox (= 8.1.4.1)
actionmailer (= 8.1.4.1)
actionpack (= 8.1.4.1)
actiontext (= 8.1.4.1)
actionview (= 8.1.4.1)
activejob (= 8.1.4.1)
activemodel (= 8.1.4.1)
activerecord (= 8.1.4.1)
activestorage (= 8.1.4.1)
activesupport (= 8.1.4.1)
bundler (>= 1.15.0)
railties (= 8.0.5.2)
railties (= 8.1.4.1)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -354,9 +356,9 @@ GEM
rails-html-sanitizer (1.7.2)
loofah (~> 2.25, >= 2.25.3)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
railties (8.0.5.2)
actionpack (= 8.0.5.2)
activesupport (= 8.0.5.2)
railties (8.1.4.1)
actionpack (= 8.1.4.1)
activesupport (= 8.1.4.1)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
Expand Down Expand Up @@ -532,7 +534,7 @@ DEPENDENCIES
pg (~> 1.1)
propshaft
puma (~> 8.1)
rails (~> 8.0.0)
rails (~> 8.1.0)
rails-controller-testing
reek
rspec-rails
Expand Down
Loading