Update all gems!

2 files changed, 86 insertions, 81 deletions

diff --git a/Gemfile b/Gemfile
index f0aab08..42d7ded 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem 'pg',     group: :postgres
 gem 'settingslogic'
 
 # Web server
-gem "puma", "~> 2.0.0.b7"
+gem "puma", "~> 2.0.1"
 
 # Haml
 gem 'haml-rails'
@@ -26,7 +26,7 @@ gem 'haml-rails'
 # Background jobs
 gem 'slim'
 gem 'sinatra', :require => nil
-gem 'sidekiq', '2.8.0'
+gem 'sidekiq'
 
 # Scheduled
 gem 'whenever', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 6ba5fe1..fa90f04 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,57 +31,55 @@ GEM
     annotate (2.5.0)
       rake
     arel (3.0.2)
-    backports (2.6.7)
-    bootstrap-sass (2.3.1.0)
+    backports (3.3.1)
+    bootstrap-sass (2.3.1.3)
       sass (~> 3.2)
     builder (3.0.4)
-    capybara (2.0.3)
+    capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    celluloid (0.12.4)
-      facter (>= 1.6.12)
+      xpath (~> 2.0)
+    celluloid (0.14.1)
       timers (>= 1.0.0)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    chronic (0.9.0)
-    coderay (1.0.8)
+    chronic (0.9.1)
+    coderay (1.0.9)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.4.0)
+    coffee-script-source (1.6.2)
     colorize (0.5.8)
     connection_pool (1.0.0)
-    coveralls (0.6.5)
+    coveralls (0.6.7)
       colorize
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       thor
     descendants_tracker (0.0.1)
-    diff-lcs (1.2.2)
+    diff-lcs (1.2.4)
+    dotenv (0.7.0)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    facter (1.6.18)
     factory_girl (4.2.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.2.1)
       factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
-    ffaker (1.14.0)
-    ffi (1.6.0)
+    ffaker (1.16.1)
+    ffi (1.8.1)
     font-awesome-sass-rails (3.0.2.2)
       railties (>= 3.1.1)
       sass-rails (>= 3.1.1)
-    foreman (0.62.0)
+    foreman (0.63.0)
+      dotenv (>= 0.7)
       thor (>= 0.13.6)
+    formatador (0.2.4)
     gitlab_ci_meta (1.0)
     grape (0.4.1)
       activesupport
@@ -97,16 +95,21 @@ GEM
       activesupport
       multi_json (>= 1.3.2)
     growl (1.0.3)
-    guard (1.3.2)
-      listen (>= 0.4.2)
+    guard (1.8.0)
+      formatador (>= 0.2.4)
+      listen (>= 1.0.0)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
       thor (>= 0.14.6)
-    guard-rspec (1.2.1)
-      guard (>= 1.1)
-    haml (3.1.7)
-    haml-rails (0.3.5)
+    guard-rspec (3.0.1)
+      guard (>= 1.8)
+      rspec (~> 2.13)
+    haml (4.0.3)
+      tilt
+    haml-rails (0.4)
       actionpack (>= 3.1, < 4.1)
       activesupport (>= 3.1, < 4.1)
-      haml (~> 3.1)
+      haml (>= 3.1, < 4.1)
       railties (>= 3.1, < 4.1)
     hashie (2.0.5)
     hike (1.2.2)
@@ -115,35 +118,38 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.1.3)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
-    json (1.7.7)
+    jquery-rails (3.0.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.0)
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     libv8 (3.11.8.17)
-    listen (0.5.0)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    listen (1.1.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    lumberjack (1.0.3)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.8.1)
-    mime-types (1.22)
-    multi_json (1.7.2)
+    mime-types (1.23)
+    multi_json (1.7.5)
     multi_xml (0.5.3)
     mysql2 (0.3.11)
     nokogiri (1.5.9)
-    pg (0.14.1)
+    pg (0.15.1)
     polyglot (0.3.3)
-    pry (0.9.10)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
-      slop (~> 3.3.1)
-    puma (2.0.0.b7)
+      slop (~> 3.4)
+    puma (2.0.1)
       rack (>= 1.1, < 2.0)
-    quiet_assets (1.0.1)
-      railties (~> 3.1)
+    quiet_assets (1.0.2)
+      railties (>= 3.1, < 5.0)
     rack (1.4.5)
     rack-accept (0.4.5)
       rack (>= 0.4)
@@ -151,7 +157,7 @@ GEM
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-protection (1.2.0)
+    rack-protection (1.5.0)
       rack
     rack-ssl (1.3.3)
       rack
@@ -173,89 +179,88 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.4)
-    rb-fsevent (0.9.1)
-    rb-inotify (0.8.8)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.0)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
       ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    redis (3.0.3)
-    redis-namespace (1.2.1)
+    redis (3.0.4)
+    redis-namespace (1.3.0)
       redis (~> 3.0.0)
-    ref (1.0.4)
+    ref (1.0.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    rspec-rails (2.13.0)
+    rspec-rails (2.13.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
       rspec-mocks (~> 2.13.0)
-    rubyzip (0.9.9)
-    sass (3.2.7)
+    sass (3.2.9)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.31.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip
-      websocket (~> 1.0.4)
-    settingslogic (2.0.8)
-    shoulda-matchers (1.3.0)
+    settingslogic (2.0.9)
+    shoulda-matchers (2.1.0)
       activesupport (>= 3.0.0)
-    sidekiq (2.8.0)
-      celluloid (~> 0.12.0)
-      connection_pool (~> 1.0)
-      multi_json (~> 1)
-      redis (~> 3)
+    sidekiq (2.12.1)
+      celluloid (>= 0.14.1)
+      connection_pool (>= 1.0.0)
+      json
+      redis (>= 3.0)
       redis-namespace
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
+    sinatra (1.3.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
+    slim (2.0.0)
+      temple (~> 0.6.5)
       tilt (~> 1.3, >= 1.3.3)
-    slim (1.3.6)
-      temple (~> 0.5.5)
-      tilt (~> 1.3.3)
-    slop (3.3.3)
+    slop (3.4.5)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    stamp (0.3.0)
-    state_machine (1.1.2)
-    temple (0.5.5)
+    stamp (0.5.0)
+    state_machine (1.2.0)
+    temple (0.6.5)
     therubyracer (0.11.4)
       libv8 (~> 3.11.8.12)
       ref
     thor (0.18.1)
-    tilt (1.3.6)
+    tilt (1.4.1)
     timers (1.1.0)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    uglifier (1.3.0)
+    uglifier (2.1.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    virtus (0.5.4)
-      backports (~> 2.6.1)
+    virtus (0.5.5)
+      backports (~> 3.3)
       descendants_tracker (~> 0.0.1)
-    websocket (1.0.7)
     whenever (0.8.2)
       activesupport (>= 2.3.4)
       chronic (>= 0.6.3)
-    xpath (1.0.0)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -283,7 +288,7 @@ DEPENDENCIES
   mysql2
   pg
   pry
-  puma (~> 2.0.0.b7)
+  puma (~> 2.0.1)
   quiet_assets
   rails (= 3.2.13)
   rake
@@ -293,7 +298,7 @@ DEPENDENCIES
   sass-rails (~> 3.2.3)
   settingslogic
   shoulda-matchers
-  sidekiq (= 2.8.0)
+  sidekiq
   sinatra
   slim
   stamp