Merge pull request #5214 from diaspora/update_gems

Update gems

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 source 'https://rails-assets.org'
 
-gem 'rails', '4.1.5'
+gem 'rails', '4.1.6'
 
 # Legacy Rails features, remove me!
 
@@ -29,7 +29,7 @@ gem 'simple_captcha2', '0.3.2', :require => 'simple_captcha'
 
 # Background processing
 
-gem 'sidekiq', '3.2.3'
+gem 'sidekiq', '3.2.5'
 gem 'sinatra', '1.3.3'
 
 # Compression
@@ -64,7 +64,7 @@ gem 'foreigner',           '1.6.1'
 
 gem 'carrierwave', '0.10.0'
 gem 'fog',         '1.23.0'
-gem 'mini_magick', '3.8.0'
+gem 'mini_magick', '3.8.1'
 gem 'remotipart',  '1.2.1'
 
 # GUID generation
@@ -77,7 +77,7 @@ gem 'entypo-rails', '2.2.2'
 # JavaScript
 
 gem 'backbone-on-rails',   '1.1.1'
-gem 'handlebars_assets',   '0.17.1'
+gem 'handlebars_assets',   '0.18.0'
 gem 'jquery-rails',        '3.1.2'
 gem 'rails-assets-jquery', '1.11.1' # Should be kept in sync with jquery-rails
 gem 'js_image_paths',      '0.0.1'
@@ -195,13 +195,13 @@ group :test do
   gem 'fixture_builder',   '0.3.6'
   gem 'fuubar',            '2.0.0'
   gem 'rspec-instafail',   '0.2.5', :require => false
-  gem 'test_after_commit', '0.2.6'
+  gem 'test_after_commit', '0.2.7'
 
   # Cucumber (integration tests)
 
   gem 'capybara',           '2.4.1'
   gem 'database_cleaner',   '1.3.0'
-  gem 'selenium-webdriver', '2.42.0'
+  gem 'selenium-webdriver', '2.43.0'
 
   # General helpers
 

Gemfile.lock

@@ -2,29 +2,29 @@ GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
   specs:
-    actionmailer (4.1.5)
+    actionmailer (4.1.6)
-      actionpack (= 4.1.5)
+      actionpack (= 4.1.6)
-      actionview (= 4.1.5)
+      actionview (= 4.1.6)
-      mail (~> 2.5.4)
+      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.5)
+    actionpack (4.1.6)
-      actionview (= 4.1.5)
+      actionview (= 4.1.6)
-      activesupport (= 4.1.5)
+      activesupport (= 4.1.6)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
     actionpack-action_caching (1.1.1)
       actionpack (>= 4.0.0, < 5.0)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)
-    actionview (4.1.5)
+    actionview (4.1.6)
-      activesupport (= 4.1.5)
+      activesupport (= 4.1.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.5)
+    activemodel (4.1.6)
-      activesupport (= 4.1.5)
+      activesupport (= 4.1.6)
       builder (~> 3.1)
-    activerecord (4.1.5)
+    activerecord (4.1.6)
-      activemodel (= 4.1.5)
+      activemodel (= 4.1.6)
-      activesupport (= 4.1.5)
+      activesupport (= 4.1.6)
       arel (~> 5.0.0)
     activerecord-import (0.5.0)
       activerecord (>= 3.0)
@@ -32,7 +32,7 @@ GEM
       activemodel (~> 4.0)
       activesupport (~> 4.0)
       rails-observers (~> 0.1.1)
-    activesupport (4.1.5)
+    activesupport (4.1.6)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -74,8 +74,8 @@ GEM
       activesupport (>= 3.2.0)
       json (>= 1.7)
       mime-types (>= 1.16)
-    celluloid (0.16.0)
+    celluloid (0.15.2)
-      timers (~> 4.0.0)
+      timers (~> 1.1.0)
     childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
     chunky_png (1.3.1)
@@ -170,7 +170,7 @@ GEM
       net-ssh (>= 2.1.3)
     fog-json (1.0.0)
       multi_json (~> 1.0)
-    fog-softlayer (0.3.16)
+    fog-softlayer (0.3.17)
       fog-core
       fog-json
     font-awesome-rails (4.2.0.0)
@@ -209,14 +209,13 @@ GEM
       spork (>= 0.8.4)
     haml (4.0.5)
       tilt
-    handlebars_assets (0.17.1)
+    handlebars_assets (0.18)
       execjs (>= 1.2.9)
       multi_json
       sprockets (>= 2.0.3)
       tilt
     hashie (3.3.1)
     hike (1.2.3)
-    hitimes (1.2.2)
     http_accept_language (2.0.2)
     i18n (0.6.11)
     i18n-inflector (2.6.7)
@@ -254,15 +253,14 @@ GEM
     lumberjack (1.0.9)
     macaddr (1.7.1)
       systemu (~> 2.6.2)
-    mail (2.5.4)
+    mail (2.6.1)
-      mime-types (~> 1.16)
+      mime-types (>= 1.16, < 3)
-      treetop (~> 1.4.8)
     markerb (1.0.2)
       redcarpet (>= 2.0)
     messagebus_ruby_api (1.0.3)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_magick (3.8.0)
+    mini_magick (3.8.1)
       subexec (~> 0.2.1)
     mini_portile (0.5.3)
     minitest (5.4.1)
@@ -312,7 +310,6 @@ GEM
       nokogiri
     orm_adapter (0.5.0)
     phantomjs (1.9.7.1)
-    polyglot (0.3.5)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -335,15 +332,15 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.5)
+    rails (4.1.6)
-      actionmailer (= 4.1.5)
+      actionmailer (= 4.1.6)
-      actionpack (= 4.1.5)
+      actionpack (= 4.1.6)
-      actionview (= 4.1.5)
+      actionview (= 4.1.6)
-      activemodel (= 4.1.5)
+      activemodel (= 4.1.6)
-      activerecord (= 4.1.5)
+      activerecord (= 4.1.6)
-      activesupport (= 4.1.5)
+      activesupport (= 4.1.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.5)
+      railties (= 4.1.6)
       sprockets-rails (~> 2.0)
     rails-assets-jquery (1.11.1)
     rails-assets-perfect-scrollbar (0.4.11)
@@ -372,9 +369,9 @@ GEM
       sass-rails (~> 4.0)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (4.1.5)
+    railties (4.1.6)
-      actionpack (= 4.1.5)
+      actionpack (= 4.1.6)
-      activesupport (= 4.1.5)
+      activesupport (= 4.1.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
@@ -395,7 +392,7 @@ GEM
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
       rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.1)
+    rspec-core (3.1.2)
       rspec-support (~> 3.1.0)
     rspec-expectations (3.1.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -423,13 +420,13 @@ GEM
       sass (~> 3.2.0)
       sprockets (~> 2.8, <= 2.11.0)
       sprockets-rails (~> 2.0)
-    selenium-webdriver (2.42.0)
+    selenium-webdriver (2.43.0)
-      childprocess (>= 0.5.0)
+      childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
-      websocket (~> 1.0.4)
+      websocket (~> 1.0)
-    sidekiq (3.2.3)
+    sidekiq (3.2.5)
-      celluloid (>= 0.15.2)
+      celluloid (= 0.15.2)
       connection_pool (>= 2.0.0)
       json
       redis (>= 3.0.6)
@@ -456,17 +453,13 @@ GEM
       sprockets (~> 2.8)
     subexec (0.2.3)
     systemu (2.6.4)
-    test_after_commit (0.2.6)
+    test_after_commit (0.2.7)
       activerecord (>= 3.2)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
     timecop (0.7.1)
-    timers (4.0.0)
+    timers (1.1.0)
-      hitimes
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
     twitter (4.8.1)
       faraday (~> 0.8, < 0.10)
       multi_json (~> 1.0)
@@ -492,7 +485,7 @@ GEM
     webmock (1.18.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    websocket (1.0.7)
+    websocket (1.2.1)
     will_paginate (3.0.7)
     xpath (2.0.0)
       nokogiri (~> 1.3)
@@ -534,7 +527,7 @@ DEPENDENCIES
   guard-rspec (= 4.3.1)
   guard-spork (= 1.5.1)
   haml (= 4.0.5)
-  handlebars_assets (= 0.17.1)
+  handlebars_assets (= 0.18.0)
   http_accept_language (= 2.0.2)
   i18n-inflector-rails (= 1.0.7)
   jasmine (= 2.0.2)
@@ -544,7 +537,7 @@ DEPENDENCIES
   json (= 1.8.1)
   markerb (= 1.0.2)
   messagebus_ruby_api (= 1.0.3)
-  mini_magick (= 3.8.0)
+  mini_magick (= 3.8.1)
   mobile-fu (= 1.3.1)
   mysql2 (= 0.3.16)
   nokogiri (= 1.6.1)
@@ -560,7 +553,7 @@ DEPENDENCIES
   rack-protection (= 1.2)
   rack-rewrite (= 1.5.0)
   rack-ssl (= 1.4.1)
-  rails (= 4.1.5)
+  rails (= 4.1.6)
   rails-assets-jquery (= 1.11.1)
   rails-assets-perfect-scrollbar (= 0.4.11)
   rails-i18n (= 4.0.3)
@@ -576,13 +569,13 @@ DEPENDENCIES
   rspec-rails (= 3.1.0)
   ruby-oembed (= 0.8.10)
   sass-rails (= 4.0.3)
-  selenium-webdriver (= 2.42.0)
+  selenium-webdriver (= 2.43.0)
-  sidekiq (= 3.2.3)
+  sidekiq (= 3.2.5)
   simple_captcha2 (= 0.3.2)
   sinatra (= 1.3.3)
   sinon-rails (= 1.10.3)
   spork (= 1.0.0rc4)
-  test_after_commit (= 0.2.6)
+  test_after_commit (= 0.2.7)
   timecop (= 0.7.1)
   twitter (= 4.8.1)
   typhoeus (= 0.6.9)