switched to edge rails

kfl62 · Feb 7, 2009 · c139c78 · c139c78
1 parent 273414b
commit c139c78
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .*
 !.gitignore
+!.gitmodules
 nbproject
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vendor/rails"]
+	path = vendor/rails
+	url = git://github.com/rails/rails.git
diff --git a/app/controllers/application.rb → app/controllers/application_controller.rb b/app/controllers/application.rb → app/controllers/application_controller.rb
@@ -4,7 +4,7 @@
 class ApplicationController < ActionController::Base
   helper :all # include all helpers, all the time
 
-  before_filter :current_database
+  #before_filter :current_database
 
   filter_parameter_logging :password, :password_confirmation
   helper_method :current_trst_user_session, :current_trst_user, :current_title, :current_logo

diff --git a/config/initializers/new_rails_defaults.rb b/config/initializers/new_rails_defaults.rb
@@ -16,4 +16,4 @@
 # if you're including raw json in an HTML page.
 ActiveSupport.escape_html_entities_in_json = false
 
-CGI::Session::ActiveRecordStore::Session.table_name = 'trst_users_sessions'
+ActiveRecord::SessionStore::Session.table_name = 'trst_users_sessions'
diff --git a/vendor/rails b/vendor/rails