luisramos0 91f52d80c8 Fix problem in order and adjustment model specs by fixing the order.adjustment association ...

This fix was taken from spree 2.1  here 3fa44165c7

2018-10-18 10:53:00 +01:00

..

assets

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

2018-10-15 17:09:26 +01:00

controllers

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

2018-10-15 17:09:26 +01:00

helpers

Merge pull request #2521 from luisramos0/cookies_in_engine

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

jobs

Reload order before sending emails to ensure state is up to date

2018-07-05 19:26:12 +10:00

mailers

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

2018-10-15 17:09:26 +01:00

models

Fix problem in order and adjustment model specs by fixing the order.adjustment association

2018-10-18 10:53:00 +01:00

overrides

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

2018-10-15 17:09:26 +01:00

presenters

Adding option to 'Inherit From Product' for enterprise_fee tax categories

2016-03-02 11:56:46 +11:00

serializers/api

Merge pull request #2817 from coopdevs/remove-reference-to-on-demand

2018-10-16 17:52:42 +02:00

services

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

2018-10-15 17:09:26 +01:00

validators

Fix failing tests and extract validation message Procs into methods

2017-07-21 12:17:12 +10:00

views

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

2018-10-15 17:09:26 +01:00