Rails4へのVerUpのためのブランチ(v1.2.2)#2
Open
fukajun wants to merge 346 commits into
Open
Conversation
…ons can choose to skip the state validation
For some windows OS which RUBY_PALTFORM is like i386-mingw32. Fixes spree#1903
This will address the issue brought up spree#1911, where the currency symbol was incorrectly being placed before the amount
Quoting fields/reserved keywords with backticks is only allowed in MySQL, while single quotes are supported by both databases. Fixes spree#1904
… stub the authorization. added the authorization_helpers by default to the generated spec_helper for extensions. Fixes spree#1902
…. Upgrading to awesome_nested_set is backwards compatible and it allows refinery (which uses awesome_nested_set) to be mounted alongside spree Fixes spree#1927
This spec was failing due to the renamed Spree::User class (to Spree::LegacyUser) respond_to is stupid and doesn't have an option to force the root node name, so we bring Rabl in to help us out there (see search/users.rabl template). The test itself needed some cosmetic changes also, but nothing too major.
Fixes spree#2182 Conflicts: core/app/controllers/spree/checkout_controller.rb
… sale or on display. Fixes spree#2167
This method is caused unwanted side-effects Related to spree#2191
This method is caused unwanted side-effects Related to spree#2191 Conflicts: core/spec/models/order/state_machine_spec.rb
* Merge search/index actions of API's OrderController * Add searching ability to API's CountriesController * Allow pages and per_page parameters to be passed to Countries * Add count node to payments index action * Allow pages and per_page parameters to be passed to Payments * Add searching ability to API's PaymentsController * Allow pages and per_page parameters to be passed to ProductProperties * Add searching ability to API's ProductPropertiesController * Merge search/index actions of API's ProductsController * Allow per_page parameter to be passed to Products * Add search and allow per_page parameter to be passed to ReturnAuthorizations * Allow pages and per_page parameters to be passed to Taxonomies * Add searching ability to API's TaxonomiesController * Add search and allow per_page parameter to be passed to Variants * Allow pages and per_page parameter to be passed to API's Zones * Add searching ability to API's ZonesController Closes spree#2198
Fixes spree#2164 Conflicts: core/app/controllers/spree/orders_controller.rb
Convenience method for grabbing a list of variants Fixes spree#2195
If a product is being shipped, let's assume that it's *in*-stock Fixes spree#2196
This is failing on Travis, but not locally. But I've *seen* it fail locally. Need a second opinion.
Fixes spree#1890 Conflicts: core/app/views/spree/admin/shared/_routes.html.erb promo/app/views/spree/admin/promotions/rules/_user.html.erb
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
No description provided.