Merged from Mako.

[selectricity] / app / controllers / application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 7462619a1153399c0946a85eea65dfaea48e0e06..9b4803092dfc48e4c3ed6a006204de60ae39323e 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -1,9 +1,9 @@
 # Filters added to this controller will be run for all controllers in the application.
 # Likewise, all the methods added will be available for all controllers.
-require 'login_engine'
 
 class ApplicationController < ActionController::Base
-  include LoginEngine
+  include AuthenticatedSystem
   helper :user
-  model :user
+  require_dependency "user"
+  
 end