Merged from Mako.

[selectricity] / app / controllers / application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index d92ab9724e81d5b69043e75d84a0038377f78ab6..9b4803092dfc48e4c3ed6a006204de60ae39323e 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -2,6 +2,8 @@
 # Likewise, all the methods added will be available for all controllers.
 
 class ApplicationController < ActionController::Base
+  include AuthenticatedSystem
   helper :user
-  model :user
+  require_dependency "user"
+  
 end