Depend on community fork of Rails 2

2 files changed, 41 insertions, 19 deletions

diff --git a/Gemfile b/Gemfile
index f8d8caf..2251c70 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,17 @@
 source "http://rubygems.org"
 
-gem "rails", "2.3.15"
+# Last released version of Rails 2.3 is 2.3.16, which does not address
+# all known security vulnerabilities. The community fork provides a
+# 2.3.15 version that does.
+git "git://github.com/rails2/rails.git", :branch => "2-3-stable" do
+  gem "rails"
+  gem "actionmailer"
+  gem "actionpack"
+  gem "activerecord"
+  gem "activeresource"
+  gem "activesupport"
+end
+
 gem "chronic", "0.3.0"
 gem "geoip", "0.8.9"
 gem "daemons", "1.1.0", :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index f5d9d6f..8470f92 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,4 +1,27 @@
 GIT
+  remote: git://github.com/rails2/rails.git
+  revision: c395a2d17653eb192a06f61a3b10076f9af0eafb
+  branch: 2-3-stable
+  specs:
+    actionmailer (2.3.15)
+      actionpack (= 2.3.15)
+    actionpack (2.3.15)
+      activesupport (= 2.3.15)
+      rack (~> 1.1.0)
+    activerecord (2.3.15)
+      activesupport (= 2.3.15)
+    activeresource (2.3.15)
+      activesupport (= 2.3.15)
+    activesupport (2.3.15)
+    rails (2.3.15)
+      actionmailer (= 2.3.15)
+      actionpack (= 2.3.15)
+      activerecord (= 2.3.15)
+      activeresource (= 2.3.15)
+      activesupport (= 2.3.15)
+      rake (>= 0.8.3)
+
+GIT
   remote: https://github.com/roman/rots.git
   revision: babb5559aae8914556da528147b6649b9c48f48c
   specs:
@@ -8,22 +31,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (2.3.15)
-      actionpack (= 2.3.15)
-    actionpack (2.3.15)
-      activesupport (= 2.3.15)
-      rack (~> 1.1.3)
     activemessaging (0.7.1)
       activesupport (>= 1.0.0)
-    activerecord (2.3.15)
-      activesupport (= 2.3.15)
     activerecord-jdbc-adapter (1.2.2.1)
     activerecord-jdbcmysql-adapter (1.2.2.1)
       activerecord-jdbc-adapter (~> 1.2.2.1)
       jdbc-mysql (~> 5.1.0)
-    activeresource (2.3.15)
-      activesupport (= 2.3.15)
-    activesupport (2.3.15)
     acts-as-taggable-on (2.0.6)
     addressable (2.2.8)
     after_commit (1.0.10)
@@ -93,13 +106,6 @@ GEM
     rack (1.1.4)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (2.3.15)
-      actionmailer (= 2.3.15)
-      actionpack (= 2.3.15)
-      activerecord (= 2.3.15)
-      activeresource (= 2.3.15)
-      activesupport (= 2.3.15)
-      rake (>= 0.8.3)
     raindrops (0.10.0)
     rake (0.8.7)
     rdiscount (1.3.1.1)
@@ -165,8 +171,13 @@ PLATFORMS
 
 DEPENDENCIES
   SystemTimer (= 1.2.3)
+  actionmailer!
+  actionpack!
   activemessaging (= 0.7.1)
+  activerecord!
   activerecord-jdbcmysql-adapter
+  activeresource!
+  activesupport!
   acts-as-taggable-on (= 2.0.6)
   builder (= 3.0.0)
   capillary (~> 1.0.1)
@@ -192,7 +203,7 @@ DEPENDENCIES
   oauth (= 0.4.4)
   paperclip (~> 2.7.2)
   proxymachine (= 1.2.4)
-  rails (= 2.3.15)
+  rails!
   rake (= 0.8.7)
   rdiscount (= 1.3.1.1)
   resque (= 1.9.8)