migrate to Rails 4.0 (closes foodcoops#214)

Conflicts: Gemfile.lock
2014-02-20 15:04:53 +01:00 · 2014-02-20 15:04:53 +01:00 · 7841245795
commit 7841245795
parent 12d1221bfc
97 changed files with 659 additions and 557 deletions
--- a/app/controllers/foodcoop/workgroups_controller.rb
+++ b/app/controllers/foodcoop/workgroups_controller.rb
@ -4,7 +4,7 @@ class Foodcoop::WorkgroupsController < ApplicationController
    :except => [:index]

  def index
-    @workgroups = Workgroup.all :order => "name"
+    @workgroups = Workgroup.order("name")
  end
  
  def edit