updates to rails 4.0.8, downgrades sprockets tp 2.11.0

brunchmade · Jul 17, 2014 · d67e2ea · d67e2ea
1 parent aaabc69
commit d67e2ea
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 33 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 ruby '2.1.0'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.0.2'
+gem 'rails', '4.0.8'
 
 gem 'awesome_print'
 gem 'backbone-on-rails'
@@ -26,6 +26,7 @@ gem 'two_factor_authentication'
 gem 'uglifier', '>= 1.3.0'
 gem 'unicorn'
 gem 'sass-rails', '~> 4.0.0'
+gem 'sprockets', '2.11.0' # 2.12.0 is broken
 gem 'zurb-foundation'
 gem 'newrelic_rpm'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,37 +1,36 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.2)
-      actionpack (= 4.0.2)
+    actionmailer (4.0.8)
+      actionpack (= 4.0.8)
       mail (~> 2.5.4)
-    actionpack (4.0.2)
-      activesupport (= 4.0.2)
+    actionpack (4.0.8)
+      activesupport (= 4.0.8)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
+    activemodel (4.0.8)
+      activesupport (= 4.0.8)
       builder (~> 3.1.0)
-    activerecord (4.0.2)
-      activemodel (= 4.0.2)
+    activerecord (4.0.8)
+      activemodel (= 4.0.8)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.2)
+      activesupport (= 4.0.8)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
     activeresource (4.0.0)
       activemodel (~> 4.0)
       activesupport (~> 4.0)
       rails-observers (~> 0.1.1)
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.8)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     addressable (2.3.5)
     arel (4.0.2)
-    atomic (1.1.14)
     awesome_print (1.2.0)
     backbone-on-rails (1.1.1.0)
       actionmailer
@@ -106,7 +105,7 @@ GEM
       sprockets (>= 2.0.3)
       tilt
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.6.11)
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
@@ -133,7 +132,7 @@ GEM
     minitest (4.7.5)
     momentjs-rails (2.7.0)
       railties (>= 3.1)
-    multi_json (1.8.4)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     newrelic_rpm (3.7.3.204)
@@ -146,36 +145,36 @@ GEM
       rack (~> 1.2)
     orm_adapter (0.5.0)
     pg (0.17.1)
-    polyglot (0.3.3)
+    polyglot (0.3.5)
     rabl (0.9.3)
       activesupport (>= 2.3.14)
     rack (1.5.2)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.2)
-      actionmailer (= 4.0.2)
-      actionpack (= 4.0.2)
-      activerecord (= 4.0.2)
-      activesupport (= 4.0.2)
+    rails (4.0.8)
+      actionmailer (= 4.0.8)
+      actionpack (= 4.0.8)
+      activerecord (= 4.0.8)
+      activesupport (= 4.0.8)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.2)
-      sprockets-rails (~> 2.0.0)
+      railties (= 4.0.8)
+      sprockets-rails (~> 2.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
     rails_12factor (0.0.2)
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.2)
     rails_stdout_logging (0.0.3)
-    railties (4.0.2)
-      actionpack (= 4.0.2)
-      activesupport (= 4.0.2)
+    railties (4.0.8)
+      actionpack (= 4.0.8)
+      activesupport (= 4.0.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.12.0)
-    rake (10.1.1)
+    rake (10.3.2)
     randexp (0.1.7)
     rotp (1.6.1)
     rqrcode (0.4.2)
@@ -201,7 +200,7 @@ GEM
     simple_form (3.0.1)
       actionpack (>= 4.0.0, < 4.1)
       activemodel (>= 4.0.0, < 4.1)
-    sprockets (2.10.1)
+    sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -210,9 +209,8 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    thor (0.19.1)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
@@ -222,7 +220,7 @@ GEM
       rails (>= 3.1.1)
       randexp
       rotp
-    tzinfo (0.3.38)
+    tzinfo (0.3.40)
     uglifier (2.4.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -264,12 +262,13 @@ DEPENDENCIES
   pg
   rabl
   rack-cache
-  rails (= 4.0.2)
+  rails (= 4.0.8)
   rails_12factor
   rqrcode-rails3
   rspec-rails
   sass-rails (~> 4.0.0)
   simple_form
+  sprockets (= 2.11.0)
   two_factor_authentication
   uglifier (>= 1.3.0)
   unicorn