Maikel 155b205ac2 Merge pull request #3401 from luisramos0/2-0-stable-jan-29th ...

[Spree Upgrade] Merging master into 2-0-stable (4th run in Jan2019)

2019-01-30 14:44:40 +11:00

..

controllers

Merge pull request #3401 from luisramos0/2-0-stable-jan-29th

2019-01-30 14:44:40 +11:00

features

Merge branch 'master' into 2-0-stable-jan-29th

2019-01-29 12:38:34 +00:00

helpers

Cover i18nhelper.valid_locale and user mailer with tests related to localized emails

2018-12-11 11:16:50 +00:00

javascripts

Improve and simplify VO count on hand suggestions

2018-12-05 17:40:30 +08: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-jan-11th

2019-01-11 11:58:24 +00:00

mailers

Specify :mailer type in specs

2019-01-13 15:50:35 +00:00

models

Merge branch 'master' into 2-0-stable-jan-29th

2019-01-29 12:38:34 +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 credit card spec that was depending on current year

2019-01-07 12:16:09 +00:00

services

Merge branch 'master' into 2-0-stable-jan-29th

2019-01-29 12:38:34 +00:00

support

Merge branch 'master' into 2-0-stable-jan-17th

2019-01-17 22:51:25 +00:00

factories.rb

Set StockLocation.backorderable_default to false in DefaultStockLocation and in StockLocation factory.

2019-01-17 20:28:05 +00:00

spec_helper.rb

Merge branch 'master' into 2-0-stable-jan-17th

2019-01-17 22:51:25 +00:00