Merge from jdong

[selectricity] / app / controllers / application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 537de40d7e3bdf68fa3816f217b9b9c997060db5..9b4803092dfc48e4c3ed6a006204de60ae39323e 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -1,4 +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.
 # 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.

+

 class ApplicationController < ActionController::Base
 class ApplicationController < ActionController::Base

-end
\ No newline at end of file
+  include AuthenticatedSystem
+  helper :user
+  require_dependency "user"
+  
+end