Fix Solidus v2.6 and prepare a 2.6.1 release #2843
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ransack 2.0.1 is the only version compatible with rails 5.2.1. Rails < 5.0 is no more supported since it needs to use ransack 1.8. This is not an issue since we are not supporting rails < 5.1 anyway.
This commit comes from @huoxito work on #15 (Thanks!) On newer versions monetize requires money 6.12 which has a rewrite of the Money#allocate method that we use in DistrubutedAmount calculator. This is the PR that is causing issues: RubyMoney/money#772 This is the issue we need to be solved before relaxing the dependency again: RubyMoney/monetize#118
huoxito
reviewed
Sep 13, 2018
core/solidus_core.gemspec
Outdated
| @@ -35,9 +35,9 @@ Gem::Specification.new do |s| | |||
| s.add_dependency 'discard', '~> 1.0' | |||
| s.add_dependency 'friendly_id', '~> 5.0' | |||
| s.add_dependency 'kaminari-activerecord', '~> 1.1' | |||
| s.add_dependency 'monetize', '~> 1.1' | |||
| s.add_dependency 'monetize', '~> 1.8.0' | |||
There was a problem hiding this comment.
think this could be ~> 1.8 since it works with both 1.8 and 1.9 versions
It works with 1.8 and 1.9 at the moment
I'm not sure why but previously the association was returning an instance of ActiveRecord::Associations::CollectionProxy that was considered not changed while reloading. Despite that `shipments` call is still returning the same object, they now have a different `object_id` and this could be the root of the problem.
kennyadsl
force-pushed
the
nebulab/2.6.1
branch
from
7764cfe to
e2f21f4
Compare
gmacdougall
approved these changes
Sep 13, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It basically applies the fixes we've done on master (#2826 and #2836), which should be good for Solidus 2.6 as well.
Thanks @huoxito