Pau Pérez Fabregat 99ba9d7d1b Merge branch '2-0-stable' into unit-test-variant-stock

2018-09-19 15:41:21 +02:00

..

archive/features/consumer

Switched gem FactoryGirl to FactoryBot as FactoryGirl is deprecated.

2018-05-04 11:52:08 -03:00

controllers

Merge pull request #2668 from luisramos0/2-0-ship-method-order-spec

2018-09-10 11:18:10 +02:00

features

Merge pull request #2588 from luisramos0/spree2_mail_method_specs

2018-09-10 11:28:34 +10:00

helpers

Auto correct Rubocop's Layout/EmptyLinesAroundAccessModifier cop

2018-04-09 18:47:17 +02:00

javascripts

Merge pull request #2542 from luisramos0/add_to_cart

2018-08-24 14:43:33 +10:00

jobs

Merge pull request #2615 from mkllnk/2575-variant-on-hand-api

2018-09-03 11:16:02 +02:00

lib

Move variant_stock.rb to concerns/

2018-09-18 12:18:50 +02:00

mailers

Merge pull request #2588 from luisramos0/spree2_mail_method_specs

2018-09-10 11:28:34 +10:00

models

Merge branch '2-0-stable' into unit-test-variant-stock

2018-09-19 15:41:21 +02:00

performance

Revert "Refactor Order#current_order argument"

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

requests

Use new basic auth stub style

2018-08-22 21:35:56 +01:00

serializers

Make admin serialiser specs runnable on their own

2018-07-10 09:59:00 +10:00

services

CreateMailMethod is now MailConfiguration and it uses Spree Config instead of MailMethod. The call from db/seeds was updated accordingly

2018-09-10 10:21:23 +01:00

support

Removed unnecessary currency from CartService constructor, using order.currency instead

2018-08-23 12:40:18 +01:00

views/json

…

factories.rb

Removing duplicated factories inserted by previous PRs: 2668 and 2670

2018-09-10 16:51:20 +01:00

spec_helper.rb

Merge branch 'master' into 2-0-stable

2018-06-22 13:23:18 +02:00