Merge from head

[selectricity] / app / controllers / application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index a5bb1085361dbdd7f9169c2d1a2d442384a15d3d..9b4803092dfc48e4c3ed6a006204de60ae39323e 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -4,5 +4,6 @@
 class ApplicationController < ActionController::Base
   include AuthenticatedSystem
   helper :user
-  model :user
+  require_dependency "user"
+  
 end