Skip to content

Commit

Permalink
Use Rails 6-1-stable branch
Browse files Browse the repository at this point in the history
The fix has been merged, but not released yet

rails/rails#44691
  • Loading branch information
tvdeyen committed Mar 16, 2022
1 parent 340e6d2 commit 9c46da2
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ source "https://rubygems.org"
gemspec

rails_version = ENV.fetch("RAILS_VERSION", 6.1).to_f
gem "rails", "~> #{rails_version}.0"
# Necessary until a new 6.1.5 version has been released
# https://github.com/rails/rails/pull/44691
if rails_version.to_s.match?(/6.1/)
gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
else
gem "rails", "~> #{rails_version}.0"
end

if ENV["DB"].nil? || ENV["DB"] == "sqlite"
gem "sqlite3", "~> 1.4.1"
Expand Down

0 comments on commit 9c46da2

Please sign in to comment.