[DO NOT MERGE] Differences Between 2-2-stable-healthwave and the official Spree-2-2 #2
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
…when installed with protected_attributes so that it will successfully bundle.
… updated with strong params
kurtfunai
force-pushed
the
2-2-stable-healthwave
branch
from
d414b7c to
9353d0c
Compare
|
Friday July 24th, Rebased to upstream/2-2-stable |
kurtfunai
force-pushed
the
2-2-stable-healthwave
branch
from
685b8f8 to
e995006
Compare
kurtfunai
changed the title
|
Upgraded Ransack to fix an issue with ActiveRecord 4.1 + Ransack: |
|
Upgraded versioncake as seen in spree-2-3: |
|
Made the eval_block method public for routes as seen in: |
|
Updated to paperclip-4-1-1 as per spree@1922ad5#commitcomment-6159392 |
|
Updated checkout#updating_from_params to match spree-2-3 and resolve deprecation warning. spree@fee9e25 |
Fix state_changes to be destroyed when the associated order is destroyed
…nside a transaction
ffaker 2 3 0
Rails 4.3 gem dep bump Kaminari v 0.17.0
- bumps money gem to ~> 6.8
bump monetize gem to 1.6.0
Rails 4.2 Bump Friendly id to v5.1.0
bump spree_core to rails 4.2
glongman
force-pushed
the
2-2-stable-healthwave
branch
from
b09213e to
120fffd
Compare
add responders gem to gemspec
typo validates not validate - Spree::PromotionRule
test - revert immediately if it does not work
…hines-activerecord resolves pluginaweek/state_machine#310
…ils42 gem change: state_machine
- controller test support - set Spree routes when calling helpers like spree_post - reset to app routes before method exits.
…port-rails42 Responders & controller test support rails42
update gemspec to version of state_machines-activerecord that works
Big legacy r42 work merge
change deliver to deliver_now
Updated json gem to 2.3.
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.
DO NOT MERGE.