Maikel b94c6c1fb6 Merge pull request #3580 from luisramos0/2-0-stable-Mar6 ...

[Spree Upgrade] Merging master into 2-0-stable (1st run in Mar2019)

2019-03-12 11:44:41 +11:00

..

controllers

Merge pull request #3568 from luisramos0/2-0-improve-order-factories

2019-03-08 09:43:26 +00:00

factories

Add flat rate calculator traits to related factories

2019-02-13 01:51:30 +11:00

features

Fix shipping_methods edit page missing translation

2019-03-07 17:15:06 +00:00

helpers

Delete Accounts and Billing dead feature code

2019-02-25 14:37:16 +00:00

javascripts

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

2019-03-06 09:19:53 +00:00

jobs

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

2019-03-06 09:19:53 +00:00

lib

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

2019-03-06 09:19:53 +00:00

mailers

Specify :mailer type in specs

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

models

Merge pull request #3321 from luisramos0/2-0-delete-acct-invoices

2019-03-04 15:54:09 +00:00

performance

Revert "Refactor Order#current_order argument"

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

requests

Merge branch '2-0-stable' into 2-0-remove-variant-count-on-hand

2019-02-26 12:47:11 +00:00

serializers

Merge branch '2-0-stable' into 2-0-remove-variant-count-on-hand

2019-02-26 12:47:11 +00:00

services

Merge branch '2-0-stable' into 2-0-remove-variant-count-on-hand

2019-02-26 12:47:11 +00:00

support

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

2019-03-06 09:19:53 +00:00

validators

Add validator for integer arrays

2019-02-08 21:26:36 +00:00

factories.rb

Merge pull request #3568 from luisramos0/2-0-improve-order-factories

2019-03-08 09:43:26 +00:00

spec_helper.rb

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

2019-02-12 16:03:33 +00:00