[Spree 2.1] Update spree revision to a version that doesnt depend on deface #5194
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
…allows us to upgrade nokogiri (done in another PR in the master branch)
luisramos0
changed the title
Merged
sauloperez
reviewed
Apr 9, 2020
| @@ -22,7 +22,7 @@ GIT | |||
|
|
|||
| GIT | |||
| remote: https://github.com/openfoodfoundation/spree.git | |||
| revision: b7ad5b473f9e38c5a1882550b2b4e348f4824f1f | |||
| revision: f9264ebca0d8dd932a7dbee471514a3b85774c8f | |||
There was a problem hiding this comment.
shouldn't this be openfoodfoundation/spree@73d0113 instead?
There was a problem hiding this comment.
I used the merge commit: https://github.com/openfoodfoundation/spree/commits/2-1-0-stable/
I think it's the correct one right?
sauloperez
approved these changes
Apr 15, 2020
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.
What? Why?
After updating spree 2-1-stable in openfoodfoundation/spree#44 we need to update the spree revision in the 3-0-stable branch. The nokogiri upgrade will flow when we merge master into 3-0-stable
What should we test?
green build.