Update rails

spiritedflow · Mar 30, 2009 · 8848ed7 · 8848ed7
1 parent 5889d38
commit 8848ed7
Show file tree

Hide file tree

Showing 1,102 changed files with 51,599 additions and 105,745 deletions.
diff --git a/app/controllers/application.rb → app/controllers/application_controller.rb b/app/controllers/application.rb → app/controllers/application_controller.rb
diff --git a/config/boot.rb b/config/boot.rb
@@ -44,6 +44,7 @@ class VendorBoot < Boot
     def load_initializer
       require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
       Rails::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path
     end
   end
 
@@ -67,7 +68,7 @@ def load_rails_gem
 
     class << self
       def rubygems_version
-        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+        Gem::RubyGemsVersion rescue nil
       end
 
       def gem_version
@@ -82,7 +83,7 @@ def gem_version
 
       def load_rubygems
         require 'rubygems'
-        min_version = '1.1.1'
+        min_version = '1.3.1'
         unless rubygems_version >= min_version
           $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1

diff --git a/config/environment.rb b/config/environment.rb
@@ -25,14 +25,14 @@
   # config.gem "bj"
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
   # config.gem "aws-s3", :lib => "aws/s3"
-  #config.gem "authlogic"
+  config.gem "authlogic"
 
   # Only load the plugins named here, in the order given. By default, all plugins 
   # in vendor/plugins are loaded in alphabetical order.
   # :all can be used as a placeholder for all plugins not explicitly named
   # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-  config.plugin_paths += ["#{RAILS_ROOT}/../../Libs"]
-  config.plugins = [:authlogic]
+  #config.plugin_paths += ["#{RAILS_ROOT}/../../Libs"]
+  #config.plugins = [:authlogic]
 
   # Add additional load paths for your own custom dirs
   # config.load_paths += %W( #{RAILS_ROOT}/extras )