bundle update / upgrade Rails to 4.2.0

1 files changed, 109 insertions, 85 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 0cb7221..1384d29 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,58 +1,62 @@
 GIT
   remote: git://github.com/zdennis/activerecord-import.git
-  revision: d8961049e79d42143034ac3c87d3a59b92316632
+  revision: 2e8f19ee9aefc9e43eebf4c91697e918d11b8747
   specs:
-    activerecord-import (0.6.0)
+    activerecord-import (0.7.0)
       activerecord (>= 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.0.rc1)
-      actionpack (= 4.2.0.rc1)
-      actionview (= 4.2.0.rc1)
-      activejob (= 4.2.0.rc1)
+    actionmailer (4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.0.rc1)
-      actionview (= 4.2.0.rc1)
-      activesupport (= 4.2.0.rc1)
-      rack (~> 1.6.0.beta2)
+    actionpack (4.2.0)
+      actionview (= 4.2.0)
+      activesupport (= 4.2.0)
+      rack (~> 1.6.0)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0.rc1)
-      activesupport (= 4.2.0.rc1)
+    actionview (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0.rc1)
-      activesupport (= 4.2.0.rc1)
+    activejob (4.2.0)
+      activesupport (= 4.2.0)
       globalid (>= 0.3.0)
-    activemodel (4.2.0.rc1)
-      activesupport (= 4.2.0.rc1)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
-    activerecord (4.2.0.rc1)
-      activemodel (= 4.2.0.rc1)
-      activesupport (= 4.2.0.rc1)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
       arel (~> 6.0)
-    activesupport (4.2.0.rc1)
-      i18n (>= 0.7.0.beta1, < 0.8)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.6)
     arel (6.0.0)
+    autoprefixer-rails (5.0.0.3)
+      execjs
+      json
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.3.1.0)
-      sass (~> 3.2)
+    bootstrap-sass (3.3.3)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.2.19)
     buftok (0.2.0)
     builder (3.2.2)
     byebug (3.5.1)
@@ -71,15 +75,14 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    columnize (0.8.9)
-    cool.io (1.1.1)
-      iobuffer (>= 1.0.0)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
+    columnize (0.9.0)
+    cool.io (1.2.4)
+    coveralls (0.7.3)
+      multi_json (~> 1.10)
+      rest-client (~> 1.7)
+      simplecov (~> 0.9.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     dalli (2.7.2)
@@ -91,20 +94,21 @@ GEM
     docile (1.1.5)
     equalizer (0.0.9)
     erubis (2.7.0)
-    eventmachine (1.0.3)
+    eventmachine (1.0.4)
     execjs (2.2.2)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    faraday (0.9.0)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.6)
     formatador (0.2.5)
+    get_process_mem (0.2.0)
     globalid (0.3.0)
       activesupport (>= 4.1.0)
-    grape (0.9.0)
+    grape (0.10.1)
       activesupport
       builder
       hashie (>= 2.1.0)
@@ -119,38 +123,48 @@ GEM
       i18n
       rabl
       tilt
-    guard (2.10.1)
+    guard (2.11.1)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
       pry (>= 0.9.12)
+      shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-rspec (4.3.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.5.0)
       guard (~> 2.1)
-      rspec (>= 2.14, < 4.0)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
     haml (4.0.6)
       tilt
-    haml-rails (0.5.3)
+    haml-rails (0.7.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
+      html2haml (>= 1.0.1)
       railties (>= 4.0.1)
     hashie (3.3.2)
     hike (1.2.3)
     hitimes (1.2.2)
+    html2haml (2.0.0)
+      erubis (~> 2.7.0)
+      haml (~> 4.0.0)
+      nokogiri (~> 1.6.0)
+      ruby_parser (~> 3.5)
     http (0.6.3)
       http_parser.rb (~> 0.6.0)
     http_parser.rb (0.6.0)
-    i18n (0.7.0.beta1)
+    i18n (0.7.0)
     ice_nine (0.11.1)
-    iobuffer (1.1.2)
-    jquery-rails (4.0.0)
+    jquery-rails (4.0.3)
       rails-dom-testing (~> 1.0)
-      railties (>= 4.2.0.beta, < 5.0)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    kgio (2.9.2)
-    listen (2.8.3)
+    json (1.8.2)
+    kgio (2.9.3)
+    listen (2.8.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -163,20 +177,24 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
     mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (5.4.3)
-    msgpack (0.5.9)
-    msgpack-rpc (0.5.2)
-      cool.io (~> 1.1.1)
-      msgpack (~> 0.5.8)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
+    msgpack (0.5.10)
+    msgpack-rpc (0.5.3)
+      cool.io (~> 1.2.4)
+      msgpack (~> 0.5.10)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     mysql2 (0.3.17)
     naught (1.0.0)
-    netrc (0.9.0)
-    nokogiri (1.6.5)
+    nenv (0.2.0)
+    netrc (0.10.2)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    notiffany (0.0.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     oauth (0.4.7)
     omniauth (1.2.2)
       hashie (>= 1.2, < 4)
@@ -193,27 +211,27 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
-    quiet_assets (1.0.3)
+    quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rabl (0.11.4)
+    rabl (0.11.5)
       activesupport (>= 2.3.14)
-    rack (1.6.0.beta2)
+    rack (1.6.0)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.0.rc1)
-      actionmailer (= 4.2.0.rc1)
-      actionpack (= 4.2.0.rc1)
-      actionview (= 4.2.0.rc1)
-      activejob (= 4.2.0.rc1)
-      activemodel (= 4.2.0.rc1)
-      activerecord (= 4.2.0.rc1)
-      activesupport (= 4.2.0.rc1)
+    rails (4.2.0)
+      actionmailer (= 4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      activemodel (= 4.2.0)
+      activerecord (= 4.2.0)
+      activesupport (= 4.2.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0.rc1)
+      railties (= 4.2.0)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -223,9 +241,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.1)
       loofah (~> 2.0)
-    railties (4.2.0.rc1)
-      actionpack (= 4.2.0.rc1)
-      activesupport (= 4.2.0.rc1)
+    railties (4.2.0)
+      actionpack (= 4.2.0)
+      activesupport (= 4.2.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
@@ -256,15 +274,20 @@ GEM
       rspec-mocks (~> 3.1.0)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
+    ruby_parser (3.6.4)
+      sexp_processor (~> 4.1)
     safe_yaml (1.0.4)
-    sass (3.4.9)
-    sass-rails (5.0.0.beta1)
+    sass (3.4.10)
+    sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2)
-      sprockets (~> 2.12)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
     settingslogic (2.0.9)
-    simple_oauth (0.3.0)
+    sexp_processor (4.4.5)
+    shellany (0.0.1)
+    simple_oauth (0.3.1)
     simplecov (0.9.1)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
@@ -272,14 +295,14 @@ GEM
     simplecov-html (0.8.0)
     slop (3.6.0)
     spring (1.2.0)
-    spring-commands-rspec (1.0.2)
+    spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -291,7 +314,7 @@ GEM
     timers (4.0.1)
       hitimes
     tins (1.3.3)
-    turbolinks (2.5.2)
+    turbolinks (2.5.3)
       coffee-rails
     twitter (5.13.0)
       addressable (~> 2.3)
@@ -310,7 +333,7 @@ GEM
       thread_safe (~> 0.1)
     tzinfo-data (1.2014.10)
       tzinfo (>= 1.0.0)
-    uglifier (2.5.3)
+    uglifier (2.7.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unf (0.1.4)
@@ -320,9 +343,10 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    unicorn-worker-killer (0.4.2)
+    unicorn-worker-killer (0.4.3)
+      get_process_mem (~> 0)
       unicorn (~> 4)
-    virtus (1.0.3)
+    virtus (1.0.4)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
@@ -360,10 +384,10 @@ DEPENDENCIES
   omniauth-twitter
   pry-rails
   quiet_assets
-  rails (~> 4.2.0.rc1)
+  rails (~> 4.2.0)
   rspec
   rspec-rails
-  sass-rails (~> 5.0.0.beta1)
+  sass-rails (~> 5.0.0)
   settingslogic
   simplecov
   spring
@@ -375,7 +399,7 @@ DEPENDENCIES
   uglifier
   unicorn
   unicorn-worker-killer
-  web-console (~> 2.0.0.beta2)
+  web-console (~> 2.0.0)
   webmock
   yajl-ruby
   yard