Luis Ramos b8f8db0341 Merge pull request #5147 from luisramos0/3-0-stable-apr3 ...

[Spree 2.1] Merge master into 3-0-stable

2020-04-04 11:03:14 +01:00

..

config

Override default spree splitters config (was Shipping Category and Backordered) to use only Base splitter, this splitter does not split the orders into multiple shipments

2019-03-26 15:37:35 +00:00

controllers

Merge branch 'master' into 3-0-stable-apr3

2020-04-03 18:26:26 +01:00

factories

Merge branch 'master' into 3-0-stable-mar20

2020-03-20 11:28:06 +00:00

features

Merge branch 'master' into 3-0-stable-apr3

2020-04-03 18:26:26 +01:00

helpers

Fix expectation in helper spec

2020-03-02 19:41:47 +01:00

javascripts

Merge pull request #5121 from Matt-Yorkley/flaky-maps-js

2020-04-02 22:13:51 +01:00

jobs

Merge branch 'master' into 3-0-stable-mar6

2020-03-06 09:20:03 +00:00

lib

Merge branch 'master' into 3-0-stable-mar20

2020-03-20 11:28:06 +00:00

mailers

run rubocop --auto-correct

2019-11-10 18:42:43 +00:00

models

Merge pull request #5147 from luisramos0/3-0-stable-apr3

2020-04-04 11:03:14 +01:00

performance

Transpec spec/performance/shop_controller_spec

2019-09-19 20:36:33 +01:00

requests

Merge branch 'master' into 3-0-stable-mar20

2020-03-20 11:28:06 +00:00

serializers/api

Pluck :id when querying active distributors for serializer data

2020-03-23 22:38:55 +01:00

services

Merge branch 'master' into 3-0-stable-apr3

2020-04-03 18:26:26 +01:00

support

Adapt specs to not use anonymous user

2020-03-07 18:14:07 +00:00

validators

Add validator for integer arrays

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

views/spree

Display delivery details in the header

2020-03-20 15:51:49 +11:00

factories.rb

Merge branch 'master' into 3-0-stable-mar20

2020-03-20 11:28:06 +00:00

spec_helper.rb

Explicitly configure shoulda-matchers in spec_helper

2020-02-22 11:06:51 +00:00