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

..

admin

Merge branch 'master' into require_standard_variant

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

api

Merge branch 'master' into variable_weights

2015-05-21 17:31:33 +10:00

checkout_controller_spec.rb

Redirecting any spree checkout_state redirects to our checkout controller

2014-12-11 14:53:11 +11:00

orders_controller_spec.rb

Removing obsolete methods

2015-01-22 10:19:42 +11:00

paypal_controller_spec.rb

Adapt cancel redirect for better spree paypal express

2014-07-25 12:44:14 +10:00

store_controller_spec.rb

Adding our own custom unauthorized page

2014-05-30 11:24:37 +10:00

user_sessions_controller_spec.rb

Don't override devise's after_sign_in_path_for, use specific before filters for user sessions and registrations controllers instead

2015-04-16 16:56:27 +10:00