Luis Ramos 0aaa41ced0 Merge pull request #3228 from luisramos0/2-0-stable-dec-18th ...

[Spree Upgrade] Merging master into 2-0-stable (third run in Dec2018)

2018-12-19 09:30:57 +00:00

..

archive/features/consumer

Switched gem FactoryGirl to FactoryBot as FactoryGirl is deprecated.

2018-05-04 11:52:08 -03:00

controllers

Merge pull request #3228 from luisramos0/2-0-stable-dec-18th

2018-12-19 09:30:57 +00:00

features

Fix deletion of product properties

2018-12-11 15:53:40 +00:00

helpers

Merge pull request #2521 from luisramos0/cookies_in_engine

2018-10-15 10:03:30 +02:00

javascripts

Fetch orders sorted by completion date

2018-11-15 15:40:13 +01:00

jobs

Merge branch 'master' into 2-0-stable-nov-8th

2018-11-08 11:18:54 +00:00

lib

Merge branch 'master' into 2-0-stable-dec-10th

2018-12-10 16:41:29 +00:00

mailers

Specify :mailer type in specs

2018-12-03 15:41:58 +01:00

models

Rename ProductOnDemand to ProductStock; move product.on_hand into it; add product.on_demand; and remove unnecessary on_demand=

2018-12-12 12:10:25 +00:00

performance

Revert "Refactor Order#current_order argument"

2018-06-05 18:42:41 +02:00

requests

Fix occurrences of order.shipping_method= by replacing with order.shipments=

2018-10-30 13:37:45 +00:00

serializers

Make test setup more readable

2018-12-14 15:12:41 +01:00

services

Merge branch 'master' into 2-0-stable-dec-18th

2018-12-18 23:32:45 +00:00

support

Restore perform_deliveries value in tests

2018-12-05 10:20:13 +01:00

factories.rb

Merge branch 'master' into 2-0-stable-nov-24th

2018-11-24 15:19:38 +00:00

spec_helper.rb

Merge branch 'master' into 2-0-stable-dec-10th

2018-12-10 16:41:29 +00:00