[Spree Upgrade] Merging master into 2-0-stable (3rd run in Feb2019) #3524
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
Bumps [dalli](https://github.com/petergoldstein/dalli) from 2.7.2 to 2.7.9. - [Release notes](https://github.com/petergoldstein/dalli/releases) - [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md) - [Commits](petergoldstein/dalli@v2.7.2...v2.7.9) Signed-off-by: dependabot[bot] <[email protected]>
Spree 2 doesn't have `Product#on_hand=` any more. We actually can't save stock levels without saving the product first which creates a stock item. This hacky solution overwrites the attribute in the entry so that it gets copied to the variant later on. I think a better solution needs some refactoring as proposed in: openfoodfoundation#2783 (comment)
The spec just tested if a job was enqueued, but not if the job can actually be executed. Unfortunately, this test is quite slow.
Co-Authored-By: mkllnk <[email protected]>
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.1 to 3.8.2. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md) - [Commits](rspec/rspec-rails@v3.8.1...v3.8.2) Signed-off-by: dependabot[bot] <[email protected]>
Bumps [spinjs-rails](https://github.com/dnagir/spinjs-rails) from 1.3 to 1.4. - [Release notes](https://github.com/dnagir/spinjs-rails/releases) - [Commits](dnagir/spinjs-rails@v1.3...v1.4) Signed-off-by: dependabot[bot] <[email protected]>
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.1.0 to 3.2.1. - [Release notes](https://github.com/fnando/i18n-js/releases) - [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md) - [Commits](fnando/i18n-js@v3.1.0...v3.2.1) Signed-off-by: dependabot[bot] <[email protected]>
This is not filling the "Fee Calc on Transfer Through" column. This will be addressed in another commit.
For exchange fees with calculator that is order-based:
* "Fee Calc on Transfer Through" should show "Entire Orders through
DISTRIBUTOR_NAME".
* For tax category:
a. If the enterprise fee itself has a tax category, this is used.
b. If the enterprise fee inherits the product's tax category, this is
"Various".
c. If the enterprise fee has no tax, this is blank.
For coordinator fees:
* "Fee Calc on Transfer Through" should be "All".
* For tax category: Same as abova.
The superclasses will include this module, instead of inheriting the class.
There is no more need to pass the summarizer.
…nterprise_fees_report-order_based_calculator_bug 3283 [Enterprise Fee Summary] Fix values when calculator is order-based
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 4.1.0 to 5.5.0. - [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases) - [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md) - [Commits](bugsnag/bugsnag-ruby@v4.1.0...v5.5.0) Signed-off-by: dependabot[bot] <[email protected]>
…name-on-invoice 3437 supplier name on invoice
…intermittent_spec_failures 3426 [Flaky Spec] Address timing issues in enterprise users feature specs
…pendabot/bundler/bugsnag-5.5.0 Bump bugsnag from 4.1.0 to 5.5.0
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.12.0 to 3.141.0. - [Release notes](https://github.com/SeleniumHQ/selenium/releases) - [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES) - [Commits](SeleniumHQ/selenium@selenium-3.12.0...selenium-3.141.0) Signed-off-by: dependabot[bot] <[email protected]>
…pendabot/bundler/selenium-webdriver-3.141.0 Bump selenium-webdriver from 3.12.0 to 3.141.0
…rency Use localized currency symbols in Subs pages
…-order-ctrl Delete empty controller class eval and spec
…ash_merge Fix hash merge for recording already created products by name
…_bom Sanitize non-parsable BOM characters inserted by Excel
…ansifex Transifex
…ansifex Transifex
…ansifex Transifex
…ansifex Transifex
…mporter-spec Apply import defaults to variants of new products in Spree 2
|
green build 💯 |
sauloperez
approved these changes
Feb 22, 2019
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.
Merging master into 2-0-stable.
Same as previous #3479
This is the result of:
git checkout master
git pull upstream master
git checkout 2-0-stable
git pull upstream 2-0-stable
git checkout -b 2-0-stable-Feb20
git merge master
Conflicts:
CONFLICT (content): Merge conflict in spec/models/product_importer_spec.rb
keep 2-0 and add adapted Chives entry
git add spec/models/product_importer_spec.rb
CONFLICT (content): Merge conflict in Gemfile.lock
keep. ffaker (1.22.1) and upgrade ffi (1.10.0)
git add Gemfile.lock
git commit
git push origin 2-0-stable-Feb20