Rohan Mitchell 7486daa2a3 Merge branch 'master' into require_standard_variant ...

Conflicts:
	spec/controllers/spree/admin/variants_controller_spec.rb
	spec/lib/open_food_network/permissions_spec.rb
	spec/lib/open_food_network/products_and_inventory_report_spec.rb
	spec/models/enterprise_spec.rb

2015-05-28 15:08:13 +10:00

..

base_controller_spec.rb

Display an error message to admin when there are hubs in order cycles that are not ready for checkout

2014-10-31 12:22:02 +11:00

orders_controller_spec.rb

Replace 'array.sort.should == expected.sort' pattern with match_array

2015-05-28 10:46:08 +10:00

overview_controller_spec.rb

Adding welcome page to overview controller

2014-10-22 16:49:32 +11:00

payment_methods_controller_spec.rb

bugfix migration ad specs

2014-09-27 18:14:10 +10:00

products_controller_spec.rb

Ignoring any new product properties submitted by a non-admin user

2015-04-02 08:55:20 +11:00

reports_controller_spec.rb

Replace 'array.sort.should == expected.sort' pattern with match_array

2015-05-28 10:46:08 +10:00

search_controller_spec.rb

Controller method to allow enterprise users to search for other users which share management of their enterprises

2015-02-12 11:34:58 +11:00

variants_controller_spec.rb

Merge branch 'master' into require_standard_variant

2015-05-28 15:08:13 +10:00