Updated Rails to 2.3.2

davidhalldor · Mar 19, 2009 · cd71e92 · cd71e92
1 parent 91837ae
commit cd71e92
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 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/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -2,7 +2,7 @@ class UsersController < ApplicationController
   # GET /users
   # GET /users.xml
   def index
-    @users = User.find(:all, :order => :name)
+    @users = User.all(:order => :name)
 
     respond_to do |format|
       format.html # index.html.erb

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
 

diff --git a/config/environment.rb b/config/environment.rb
@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
@@ -17,7 +17,7 @@ def test_create_valid_user
     assert user.errors.invalid?(:name)
     assert user.errors.invalid?(:email)
     assert user.errors.invalid?(:password)
-    #assert user.errors.invalid?(:password_confirmation)
+    assert user.errors.invalid?(:password_confirmation)
   end
 
 end