Upgrading to latest 3.2 rails in preparation for #114

agile-alliance-brazil · Dec 18, 2014 · 82a2d56 · 82a2d56
1 parent 0c85481
commit 82a2d56
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 29 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,8 +1,8 @@
 #encoding: utf-8 
 source 'http://rubygems.org'
 
-gem 'rails', '3.2.19' # Issue #114 - 4.0.2 is target
-gem 'activemodel', '3.2.19', require: 'active_model' # Remove once issue #114 is done as this is part of rails 4
+gem 'rails', '3.2.21' # Issue #114 - 4.0.2 is target
+gem 'activemodel', '3.2.21', require: 'active_model' # Remove once issue #114 is done as this is part of rails 4
 gem 'strong_parameters', '0.2.3' # Remove once issue #114 is done as this is part of rails 4
 gem 'jquery-rails', '3.1.0'
 gem 'haml', '4.0.5'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,31 +2,31 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (3.2.19)
-      actionpack (= 3.2.19)
+    actionmailer (3.2.21)
+      actionpack (= 3.2.21)
       mail (~> 2.5.4)
-    actionpack (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
+    actionpack (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.19)
-      activesupport (= 3.2.19)
+    activemodel (3.2.21)
+      activesupport (= 3.2.21)
       builder (~> 3.0.0)
-    activerecord (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
+    activerecord (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-    activesupport (3.2.19)
+    activeresource (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
+    activesupport (3.2.21)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     acts-as-taggable-on (3.2.6)
@@ -204,17 +204,17 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.19)
-      actionmailer (= 3.2.19)
-      actionpack (= 3.2.19)
-      activerecord (= 3.2.19)
-      activeresource (= 3.2.19)
-      activesupport (= 3.2.19)
+    rails (3.2.21)
+      actionmailer (= 3.2.21)
+      actionpack (= 3.2.21)
+      activerecord (= 3.2.21)
+      activeresource (= 3.2.21)
+      activesupport (= 3.2.21)
       bundler (~> 1.0)
-      railties (= 3.2.19)
-    railties (3.2.19)
-      actionpack (= 3.2.19)
-      activesupport (= 3.2.19)
+      railties (= 3.2.21)
+    railties (3.2.21)
+      actionpack (= 3.2.21)
+      activesupport (= 3.2.21)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -301,7 +301,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.41)
+    tzinfo (0.3.42)
     uniform_notifier (1.6.2)
     validates_existence (0.9.2)
       activerecord
@@ -316,7 +316,7 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth (= 4.2.9)
-  activemodel (= 3.2.19)
+  activemodel (= 3.2.21)
   acts-as-taggable-on (= 3.2.6)
   acts_as_commentable (= 3.0.1)
   airbrake (= 4.0.0)
@@ -354,7 +354,7 @@ DEPENDENCIES
   mysql2 (= 0.3.16)
   newrelic_rpm (= 3.8.1.221)
   pry-rails (= 0.3.2)
-  rails (= 3.2.19)
+  rails (= 3.2.21)
   rspec-collection_matchers (= 1.0.0)
   rspec-its (= 1.0.1)
   rspec-rails (= 3.0.1)

diff --git a/vendor/cache/actionmailer-3.2.19.gem b/vendor/cache/actionmailer-3.2.19.gem
diff --git a/vendor/cache/actionmailer-3.2.21.gem b/vendor/cache/actionmailer-3.2.21.gem
diff --git a/vendor/cache/actionpack-3.2.19.gem b/vendor/cache/actionpack-3.2.19.gem
diff --git a/vendor/cache/actionpack-3.2.21.gem b/vendor/cache/actionpack-3.2.21.gem
diff --git a/vendor/cache/activemodel-3.2.19.gem b/vendor/cache/activemodel-3.2.19.gem
diff --git a/vendor/cache/activemodel-3.2.21.gem b/vendor/cache/activemodel-3.2.21.gem
diff --git a/vendor/cache/activerecord-3.2.19.gem b/vendor/cache/activerecord-3.2.19.gem
diff --git a/vendor/cache/activerecord-3.2.21.gem b/vendor/cache/activerecord-3.2.21.gem
diff --git a/vendor/cache/activeresource-3.2.19.gem b/vendor/cache/activeresource-3.2.19.gem
diff --git a/vendor/cache/activeresource-3.2.21.gem b/vendor/cache/activeresource-3.2.21.gem
diff --git a/vendor/cache/activesupport-3.2.19.gem b/vendor/cache/activesupport-3.2.19.gem
diff --git a/vendor/cache/activesupport-3.2.21.gem b/vendor/cache/activesupport-3.2.21.gem
diff --git a/vendor/cache/rails-3.2.19.gem b/vendor/cache/rails-3.2.19.gem
diff --git a/vendor/cache/rails-3.2.21.gem b/vendor/cache/rails-3.2.21.gem
diff --git a/vendor/cache/railties-3.2.19.gem b/vendor/cache/railties-3.2.19.gem
diff --git a/vendor/cache/railties-3.2.21.gem b/vendor/cache/railties-3.2.21.gem
diff --git a/vendor/cache/tzinfo-0.3.41.gem b/vendor/cache/tzinfo-0.3.41.gem
diff --git a/vendor/cache/tzinfo-0.3.42.gem b/vendor/cache/tzinfo-0.3.42.gem