Pau Perez 5845f80af0 Remove commented out code ...

Because git keeps it for you.

2018-12-05 10:05:39 +01:00

..

assets

Merge branch 'master' into 2-0-stable-dec-3rd

2018-12-03 15:30:16 +00:00

controllers

Merge branch 'master' into 2-0-stable-dec-3rd

2018-12-03 15:30:16 +00:00

helpers

Merge branch 'master' into 2-0-stable-dec-3rd

2018-12-03 15:30:16 +00: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

Merge pull request #3147 from luisramos0/2-0-vos

2018-12-05 10:50:20 +11:00

overrides

Merge branch 'master' into 2-0-stable-dec-3rd

2018-12-03 15:30:16 +00: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 #2998 from coopdevs/adapt-product-on-demand

2018-11-08 19:21:46 +00:00

services

Remove shipping_method_id from order factory. This attribute is gone in spree 2 and doesnt need to be the responsibility of the order factory to handle order shipping method. The shipping method is selected only when the order workflow is progressed on checkout

2018-11-13 21:25:59 +00:00

validators

Fix failing tests and extract validation message Procs into methods

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

views

Remove commented out code

2018-12-05 10:05:39 +01:00