Luis Ramos 32a4355f09 Merge branch 'master' into 3-0-stable-mar6

2020-03-12 16:54:09 +00: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-mar6

2020-03-12 16:54:09 +00:00

factories

Move enterprise logo and promo_image setting in factories to after creation fixes a problem with enterprise_roles in the enterprise validation

2020-02-27 18:32:56 +00:00

features

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

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

helpers

Fix expectation in helper spec

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

javascripts

Merge pull request #4780 from luisramos0/bulk_prod_errors

2020-02-25 18:49:54 +00: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-mar6

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

mailers

run rubocop --auto-correct

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

models

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

2020-03-12 16:54:09 +00:00

performance

Transpec spec/performance/shop_controller_spec

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

requests

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

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

serializers/api

Remove supplied products from enterprise serializer and from UI side

2019-12-12 18:44:44 +00:00

services

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

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

support

Merge pull request #4847 from Matt-Yorkley/3-0-enterprise-user

2020-03-03 10:30:25 +01:00

validators

Add validator for integer arrays

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

views/spree

Find last payment deterministically

2020-02-20 15:59:57 +11:00

factories.rb

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

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

spec_helper.rb

Explicitly configure shoulda-matchers in spec_helper

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