Maikel 2d3f706c05 Merge pull request #3042 from luisramos0/2-0-stable-nov-14th ...

[Spree Upgrade] Merging master into 2-0-stable (second run in Nov2018)

2018-11-15 15:02:21 +11:00

..

archive/features/consumer

Switched gem FactoryGirl to FactoryBot as FactoryGirl is deprecated.

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

controllers

Fix api/orders_controller_spec by fixing expectations on order attributes: remove old attributes shipments_path and show_path

2018-11-12 16:31:57 +00:00

features

Fix admin payments spec. Add missing payment method to order.distributor

2018-11-14 11:26:26 +00:00

helpers

Merge pull request #2521 from luisramos0/cookies_in_engine

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

javascripts

Merge pull request #2912 from Matt-Yorkley/admin_orders_refactor

2018-11-02 16:57:28 +11:00

jobs

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

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

lib

Merge pull request #2974 from luisramos0/2-0-user-balance

2018-11-06 16:00:44 +00:00

mailers

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

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

models

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

2018-11-14 11:35:58 +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

Fix outdated credit card spec

2018-11-07 20:48:54 +00:00

services

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

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

support

Extract email setup in specs for easy upgrade

2018-10-25 13:53:22 +11:00

factories.rb

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

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

spec_helper.rb

Merge branch 'master' into 2-0-stable-oct-25

2018-10-25 14:28:58 +01:00