udate deps

Gemfile

@@ -6,7 +6,7 @@ gem 'mysql2', '~> 0.3.13'
 
 # Auth
 gem 'devise', '~> 3.2.2'
-gem 'omniauth', '~> 1.1.4'
+gem 'omniauth', '~> 1.2.1'
 gem 'omniauth-google-oauth2', '~> 0.2.2'
 gem 'cancan', '= 1.6.7'
 gem 'switch_user', '~> 0.9.3'
@@ -40,26 +40,26 @@ gem 'rails-settings-cached', '~> 0.3.1'
 gem 'acts_as_nested_interval', '~> 0.1.0'
 gem 'seedbank', '~> 0.3.0'
 gem 'unicorn', '~> 4.6.3'
-gem 'dalli', '~> 2.6.2'
+gem 'dalli', '~> 2.7.0'
 gem 'json', '~> 1.8.0'
 gem 'rails_admin', '~> 0.6.0'
 
 # Assets
-gem 'uglifier', '~> 2.3.1'
+gem 'uglifier', '~> 2.4.0'
 gem 'oily_png', '~> 1.1.0'
 gem 'therubyracer', '~> 0.12.0'
 gem 'sass-rails', '~> 4.0.0'
 gem 'compass-rails', '~> 1.1.0'
 gem 'bootstrap-sass', '~> 3.0.3.0'
-gem 'font-awesome-rails', '~> 4.0.3.0'
-gem 'webshims-rails', '~> 1.11.1'
+gem 'font-awesome-rails', '~> 4.0.3.1'
+gem 'webshims-rails', '~> 1.12.0'
 gem 'detect_timezone_rails', '~> 0.0.3'
 gem 'nprogress-rails', '~> 0.1.2.2'
 gem 'animate-rails', '~> 1.0.0'
 gem 'coffee-rails', '~> 4.0.0'
 gem 'jquery-rails', '~> 3.0.4'
 gem 'jquery-ui-rails', '~> 4.1.0'
-gem 'turbolinks', '~> 2.1.0'
+gem 'turbolinks', '~> 2.2.0'
 
 group :development do
   gem 'quiet_assets', '~> 1.0.1'

Gemfile.lock

@@ -76,7 +76,7 @@ GEM
       activesupport
       uniform_notifier (>= 1.4.0)
     cancan (1.6.7)
-    capybara (2.2.0)
+    capybara (2.2.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -98,7 +98,7 @@ GEM
     compass-rails (1.1.3)
       compass (>= 0.12.2)
     concerned_with (0.1.0)
-    dalli (2.6.4)
+    dalli (2.7.0)
     database_rewinder (0.0.2)
     debase (0.0.9)
       debugger-ruby_core_source
@@ -122,16 +122,15 @@ GEM
       railties (>= 3.0.0)
     faker (1.2.0)
       i18n (~> 0.5)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    font-awesome-rails (4.0.3.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    font-awesome-rails (4.0.3.1)
       railties (>= 3.2, < 5.0)
     fssm (0.2.10)
-    haml (4.0.4)
+    haml (4.0.5)
       tilt
     hashie (2.0.5)
     hike (1.2.3)
-    httpauth (0.2.0)
     i18n (0.6.9)
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
@@ -139,9 +138,9 @@ GEM
     jquery-ui-rails (4.1.1)
       railties (>= 3.1.0)
     json (1.8.1)
-    jwt (0.1.10)
+    jwt (0.1.11)
       multi_json (>= 1.5)
-    kaminari (0.15.0)
+    kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.8.1)
@@ -159,8 +158,9 @@ GEM
     mime-types (1.25.1)
     mini_portile (0.5.2)
     minitest (4.7.5)
-    multi_json (1.8.2)
-    multipart-post (1.2.0)
+    multi_json (1.8.4)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
     mysql2 (0.3.14)
     nested_form (0.3.2)
     nilify_blanks (1.0.3)
@@ -169,23 +169,25 @@ GEM
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     nprogress-rails (0.1.2.3)
-    oauth2 (0.8.1)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
       rack (~> 1.2)
     oily_png (1.1.0)
       chunky_png (~> 1.2.7)
-    omniauth (1.1.4)
+    omniauth (1.2.1)
       hashie (>= 1.2, < 3)
-      rack
+      rack (~> 1.0)
     omniauth-google-oauth2 (0.2.2)
       omniauth (~> 1.0)
       omniauth-oauth2
-    omniauth-oauth2 (1.1.1)
-      oauth2 (~> 0.8.0)
-      omniauth (~> 1.0)
+    omniauth-oauth2 (1.1.2)
+      faraday (>= 0.8, < 0.10)
+      multi_json (~> 1.3)
+      oauth2 (~> 0.9.3)
+      omniauth (~> 1.2)
     orm_adapter (0.5.0)
     paper_trail (3.0.0)
       activerecord (>= 3.0, < 5.0)
@@ -284,10 +286,10 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (2.1.0)
+    turbolinks (2.2.0)
       coffee-rails
     tzinfo (0.3.38)
-    uglifier (2.3.3)
+    uglifier (2.4.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unicorn (4.6.3)
@@ -297,7 +299,7 @@ GEM
     uniform_notifier (1.4.0)
     warden (1.2.3)
       rack (>= 1.0)
-    webshims-rails (1.11.6.1)
+    webshims-rails (1.12.0)
       rails (> 3.1.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
@@ -319,14 +321,14 @@ DEPENDENCIES
   coffee-rails (~> 4.0.0)
   compass-rails (~> 1.1.0)
   concerned_with (~> 0.1.0)
-  dalli (~> 2.6.2)
+  dalli (~> 2.7.0)
   database_rewinder (~> 0.0.1)
   debase (~> 0.0.7)
   detect_timezone_rails (~> 0.0.3)
   devise (~> 3.2.2)
   factory_girl_rails (~> 4.3.0)
   faker (~> 1.2.0)
-  font-awesome-rails (~> 4.0.3.0)
+  font-awesome-rails (~> 4.0.3.1)
   jquery-rails (~> 3.0.4)
   jquery-ui-rails (~> 4.1.0)
   json (~> 1.8.0)
@@ -337,7 +339,7 @@ DEPENDENCIES
   nilify_blanks (~> 1.0.2)
   nprogress-rails (~> 0.1.2.2)
   oily_png (~> 1.1.0)
-  omniauth (~> 1.1.4)
+  omniauth (~> 1.2.1)
   omniauth-google-oauth2 (~> 0.2.2)
   paper_trail (~> 3.0.0)
   quiet_assets (~> 1.0.1)
@@ -353,9 +355,9 @@ DEPENDENCIES
   squeel (~> 1.1.0)
   switch_user (~> 0.9.3)
   therubyracer (~> 0.12.0)
-  turbolinks (~> 2.1.0)
-  uglifier (~> 2.3.1)
+  turbolinks (~> 2.2.0)
+  uglifier (~> 2.4.0)
   unicorn (~> 4.6.3)
   userstamp (~> 2.0.2)!
   validates_hostname (~> 1.0.0)!
-  webshims-rails (~> 1.11.1)
+  webshims-rails (~> 1.12.0)