Rohan Mitchell d320b2e7d4 Merge branch 'fix-delayed-job' into combined/producer-emails-simplify_fix-delayed-job

2015-12-02 15:06:38 +11:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

2014-09-06 12:00:27 +10:00

controllers

Making sure that price and final_weight_volume can be updated (by distributor or coordinator)

2015-11-25 14:23:55 +11:00

features

Making sure that price and final_weight_volume can be updated (by distributor or coordinator)

2015-11-25 14:23:55 +11:00

helpers

Decouple generic injection spec from EnterpriseSerializer

2015-06-03 12:53:46 +10:00

javascripts

Ensure that dates in BOM AJAX requests have timezones

2015-11-25 15:06:15 +11:00

jobs

Merge branch 'master' into line_item_naming

2015-11-13 09:54:26 +11:00

lib

Remove receival_time from exchange, just use receival_instructions

2015-12-02 15:05:49 +11:00

mailers

Remove receival_time from exchange, just use receival_instructions

2015-12-02 15:05:49 +11:00

models

Merge branch 'fix-delayed-job' into combined/producer-emails-simplify_fix-delayed-job

2015-12-02 15:06:38 +11:00

performance

Make benchmark more realistic

2015-11-13 14:03:07 +11:00

requests

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00

serializers

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00

support

Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n

2015-11-13 15:20:58 +11:00

views/json

Removing stupid unusable spec

2015-04-09 17:20:31 +10:00

factories.rb

Remove receival_time from exchange, just use receival_instructions

2015-12-02 15:05:49 +11:00

spec_helper.rb

Extract multi-sample benchmarking into a helper method

2015-11-13 14:03:07 +11:00