Pau Pérez Fabregat 257b311e04 Merge pull request #5158 from openfoodfoundation/3-0-stable ...

Merge 3-0-stable to master

2020-06-15 13:35:58 +02: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

Fix problem with stub_const, we need auto load the controller before the const is stubbed otherwise the controller will be broken

2020-06-09 10:52:53 +01:00

factories

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

2020-05-13 19:50:32 +01:00

features

Comment out flaky variant overrides spec

2020-06-15 11:43:30 +01:00

helpers

Merge pull request #5158 from openfoodfoundation/3-0-stable

2020-06-15 13:35:58 +02:00

javascripts

Merge pull request #5556 from Matt-Yorkley/geocoding-service

2020-06-11 15:19:08 +02:00

jobs

Merge branch 'master' into 3-0-stable-may-22

2020-05-22 22:54:19 +01:00

lib

Merge branch 'master' into 3-0-stable-may-22

2020-05-22 22:54:19 +01:00

mailers

Skip deleted default_scope in OC notification

2020-04-17 17:25:34 +02:00

models

Fix issue in product_spec

2020-06-11 20:26:57 +01:00

performance

Move ProxyOrderSyncer to OrderManagement engine

2020-03-16 17:20:01 +00:00

requests

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

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

serializers/api

Merge pull request #5341 from mathewdbutton/5173-show-outstanding-order-balance-on-orders-page

2020-05-07 16:03:58 +01:00

services

Comment out flaky spec

2020-06-15 11:01:35 +01:00

support

Merge branch 'master' into 3-0-stable-jun-2

2020-06-08 19:17:11 +01: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

Allow to create order_cycle_schedules

2020-05-22 14:22:31 +02:00

spec_helper.rb

Merge branch 'master' into 3-0-stable-jun-2

2020-06-08 19:17:11 +01:00