Updated rails to 2.3.18

3 files changed, 24 insertions, 22 deletions

diff --git a/Gemfile b/Gemfile
index 4e052f3..35ae1f8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source "http://rubygems.org"
-gem "rails", "2.3.16"
+gem "rails", "2.3.18"
 gem "sqlite3"
 gem "json", "1.5.3"
 gem "jsonpretty"
diff --git a/Gemfile.lock b/Gemfile.lock
index bdd1f9f..52c29b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,43 +1,45 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (2.3.16)
-      actionpack (= 2.3.16)
-    actionpack (2.3.16)
-      activesupport (= 2.3.16)
+    actionmailer (2.3.18)
+      actionpack (= 2.3.18)
+    actionpack (2.3.18)
+      activesupport (= 2.3.18)
       rack (~> 1.1.0)
-    activerecord (2.3.16)
-      activesupport (= 2.3.16)
-    activeresource (2.3.16)
-      activesupport (= 2.3.16)
-    activesupport (2.3.16)
+    activerecord (2.3.18)
+      activesupport (= 2.3.18)
+    activeresource (2.3.18)
+      activesupport (= 2.3.18)
+    activesupport (2.3.18)
     columnize (0.3.6)
-    haml (3.1.7)
+    haml (4.0.3)
+      tilt
     i18n (0.3.7)
     json (1.5.3)
     jsonpretty (1.1.0)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    rack (1.1.5)
-    rails (2.3.16)
-      actionmailer (= 2.3.16)
-      actionpack (= 2.3.16)
-      activerecord (= 2.3.16)
-      activeresource (= 2.3.16)
-      activesupport (= 2.3.16)
+    rack (1.1.6)
+    rails (2.3.18)
+      actionmailer (= 2.3.18)
+      actionpack (= 2.3.18)
+      activerecord (= 2.3.18)
+      activeresource (= 2.3.18)
+      activesupport (= 2.3.18)
       rake (>= 0.8.3)
     rake (0.9.2.2)
     rbx-require-relative (0.0.9)
-    rdoc (3.12)
+    rdoc (3.12.2)
       json (~> 1.4)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    simple-navigation (3.10.0)
+    simple-navigation (3.10.1)
       activesupport (>= 2.3.2)
     sqlite3 (1.3.7)
+    tilt (1.4.1)
 
 PLATFORMS
   ruby
@@ -47,7 +49,7 @@ DEPENDENCIES
   i18n (= 0.3.7)
   json (= 1.5.3)
   jsonpretty
-  rails (= 2.3.16)
+  rails (= 2.3.18)
   rake (~> 0.9.2.2)
   rdoc (~> 3.12)
   ruby-debug
diff --git a/config/environment.rb b/config/environment.rb
index fdb07fd..9d23148 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -19,7 +19,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.16' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.18' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')