Skip to content

Commit

Permalink
Allow Rails 6.1 and make it the default
Browse files Browse the repository at this point in the history
  • Loading branch information
robinboening committed Mar 10, 2021
1 parent 44d97d2 commit 643ed86
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jobs:
matrix:
rails:
- '6.0'
- '6.1'
ruby:
- '2.6.6'
- '2.7.2'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source "https://rubygems.org"

gemspec

rails_version = ENV.fetch("RAILS_VERSION", 6.0).to_f
rails_version = ENV.fetch("RAILS_VERSION", 6.1).to_f
gem "rails", "~> #{rails_version}.0"

if ENV["DB"].nil? || ENV["DB"] == "sqlite"
Expand Down
2 changes: 1 addition & 1 deletion alchemy_cms.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Gem::Specification.new do |gem|
gem.add_runtime_dependency 'kaminari', ['~> 1.1']
gem.add_runtime_dependency 'originator', ['~> 3.1']
gem.add_runtime_dependency 'non-stupid-digest-assets', ['~> 1.0.8']
gem.add_runtime_dependency 'rails', ['>= 6.0', '< 6.1']
gem.add_runtime_dependency 'rails', ['>= 6.0', '< 6.2']
gem.add_runtime_dependency 'ransack', ['>= 1.8', '< 2.4.2'] # 2.4.2 dropped Ruby 2.5 support in a patch level release
gem.add_runtime_dependency 'request_store', ['~> 1.2']
gem.add_runtime_dependency 'responders', ['>= 2.0', '< 4.0']
Expand Down

0 comments on commit 643ed86

Please sign in to comment.