Skip to content

Commit

Permalink
Merge pull request #2542 from sascha-karnatz/increase-to-rails-7.0
Browse files Browse the repository at this point in the history
Increase minimum Rails version to v7.0
  • Loading branch information
tvdeyen authored Aug 2, 2023
2 parents daaeb9c + 124988f commit abb284a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ jobs:
fail-fast: false
matrix:
rails:
- "6.1"
- "7.0"
ruby:
- "3.0"
Expand Down
2 changes: 1 addition & 1 deletion alchemy_cms.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
activesupport
railties
].each do |rails_gem|
gem.add_runtime_dependency rails_gem, [">= 6.1", "< 7.1"]
gem.add_runtime_dependency rails_gem, [">= 7.0", "< 7.1"]
end

gem.add_runtime_dependency "active_model_serializers", ["~> 0.10.0"]
Expand Down
2 changes: 1 addition & 1 deletion app/models/alchemy/picture/url.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def uid
thumb.uid
else
uid = PictureThumb::Uid.call(signature, variant)
ActiveRecord::Base.connected_to(role: ActiveRecord::Base.writing_role) do
ActiveRecord::Base.connected_to(role: ActiveRecord.writing_role) do
PictureThumb::Create.call(variant, signature, uid)
end
uid
Expand Down
2 changes: 1 addition & 1 deletion spec/models/alchemy/picture/url_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
end

it "connects to writing database" do
writing_role = ActiveRecord::Base.writing_role
writing_role = ActiveRecord.writing_role
expect(ActiveRecord::Base).to receive(:connected_to).with(role: writing_role)
subject
end
Expand Down

0 comments on commit abb284a

Please sign in to comment.