Merge branch '89-action_view-security-alert'

marnen · Dec 4, 2013 · a6873e6 · a6873e6
2 parents fa0ce8f + 6e30dc5
commit a6873e6
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 26 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,7 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.20'
+gem 'rails', github: 'rails/rails', branch: '3-0-stable'
+# TODO: go back to released gem if 5aeb472d990fef093a3d674bd20e4e9eb45ac962 gets incorporated into 3.0.21 (or when we upgrade to 3.2).
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,11 +8,11 @@ GIT
       arel (>= 2.0.6)
       rgeo (>= 0.3.20)
 
-GEM
-  remote: http://rubygems.org/
+GIT
+  remote: git://github.com/rails/rails.git
+  revision: 5aeb472d990fef093a3d674bd20e4e9eb45ac962
+  branch: 3-0-stable
   specs:
-    ZenTest (4.9.5)
-    abstract (1.0.0)
     actionmailer (3.0.20)
       actionpack (= 3.0.20)
       mail (~> 2.2.19)
@@ -35,12 +35,32 @@ GEM
       activesupport (= 3.0.20)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activerecord-postgis-adapter (0.6.5)
-      rgeo-activerecord (~> 0.5.0)
     activeresource (3.0.20)
       activemodel (= 3.0.20)
       activesupport (= 3.0.20)
     activesupport (3.0.20)
+    rails (3.0.20)
+      actionmailer (= 3.0.20)
+      actionpack (= 3.0.20)
+      activerecord (= 3.0.20)
+      activeresource (= 3.0.20)
+      activesupport (= 3.0.20)
+      bundler (~> 1.0)
+      railties (= 3.0.20)
+    railties (3.0.20)
+      actionpack (= 3.0.20)
+      activesupport (= 3.0.20)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    ZenTest (4.9.5)
+    abstract (1.0.0)
+    activerecord-postgis-adapter (0.6.5)
+      rgeo-activerecord (~> 0.5.0)
     addressable (2.2.6)
     arel (2.0.10)
     authlogic (3.0.3)
@@ -106,13 +126,13 @@ GEM
     highline (1.6.19)
     hoe (3.5.0)
       rake (>= 0.8, < 11.0)
-    i18n (0.5.0)
+    i18n (0.5.2)
     json (1.8.0)
     json_pure (1.5.4)
       spruz (~> 0.2.8)
     launchy (2.0.5)
       addressable (~> 2.2.6)
-    mail (2.2.19)
+    mail (2.2.20)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -139,20 +159,6 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.20)
-      actionmailer (= 3.0.20)
-      actionpack (= 3.0.20)
-      activerecord (= 3.0.20)
-      activeresource (= 3.0.20)
-      activesupport (= 3.0.20)
-      bundler (~> 1.0)
-      railties (= 3.0.20)
-    railties (3.0.20)
-      actionpack (= 3.0.20)
-      activesupport (= 3.0.20)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.4)
     rake (10.1.0)
     rdiscount (1.6.8)
     rdoc (3.12.2)
@@ -185,10 +191,10 @@ GEM
     test-unit (1.2.3)
       hoe (>= 1.5.1)
     thor (0.14.6)
-    treetop (1.4.12)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -214,7 +220,7 @@ DEPENDENCIES
   pg
   pickle
   prawn
-  rails (= 3.0.20)
+  rails!
   rdiscount
   rgeo-activerecord!
   rspec-rails (~> 2.11.0)