From d745d621f812f556f24b9c86be68031f450e5d7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:00:38 +0200
Subject: [PATCH 01/27] bump acts-as-taggable-on

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 24d694d4b..421266f10 100644
--- a/Gemfile
+++ b/Gemfile
@@ -111,7 +111,7 @@ gem 'omniauth-wordpress','0.2.1'
 
 # Tags
 
-gem 'acts-as-taggable-on', '3.2.6'
+gem 'acts-as-taggable-on', '3.3.0'
 
 # URIs and HTTP
 
diff --git a/Gemfile.lock b/Gemfile.lock
index dfa113a28..ccd9e959e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,7 +37,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    acts-as-taggable-on (3.2.6)
+    acts-as-taggable-on (3.3.0)
       activerecord (>= 3, < 5)
     acts_as_api (0.4.2)
       activemodel (>= 3.0.0)
@@ -480,7 +480,7 @@ DEPENDENCIES
   actionpack-action_caching
   actionpack-page_caching
   activerecord-import (= 0.5.0)
-  acts-as-taggable-on (= 3.2.6)
+  acts-as-taggable-on (= 3.3.0)
   acts_as_api (= 0.4.2)
   addressable (= 2.3.6)
   asset_sync (= 1.0.0)

From 168aa2630614795b640b4d09b543440cb1be7836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:01:09 +0200
Subject: [PATCH 02/27] bump asset_sync

---
 Gemfile      |  2 +-
 Gemfile.lock | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 421266f10..883cff3d8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -166,7 +166,7 @@ group :production do # we don't install these on travis to speed up test runs
 
   # Third party asset hosting
 
-  gem 'asset_sync', '1.0.0', :require => false
+  gem 'asset_sync', '1.1.0', :require => false
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index ccd9e959e..e85ef0ea3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,9 +45,10 @@ GEM
       rack (>= 1.1.0)
     addressable (2.3.6)
     arel (5.0.1.20140414130214)
-    asset_sync (1.0.0)
+    asset_sync (1.1.0)
       activemodel
       fog (>= 1.8.0)
+      unf
     backbone-on-rails (1.1.1.0)
       actionmailer
       actionpack
@@ -133,7 +134,7 @@ GEM
     erubis (2.7.0)
     ethon (0.7.1)
       ffi (>= 1.3.0)
-    excon (0.39.0)
+    excon (0.39.5)
     execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (4.4.0)
@@ -155,7 +156,7 @@ GEM
       fog-json
       ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
-    fog-brightbox (0.1.1)
+    fog-brightbox (0.3.0)
       fog-core (~> 1.22)
       fog-json
       inflecto
@@ -455,6 +456,9 @@ GEM
     uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.6)
     unicorn (4.8.3)
       kgio (~> 2.6)
       rack
@@ -483,7 +487,7 @@ DEPENDENCIES
   acts-as-taggable-on (= 3.3.0)
   acts_as_api (= 0.4.2)
   addressable (= 2.3.6)
-  asset_sync (= 1.0.0)
+  asset_sync (= 1.1.0)
   backbone-on-rails (= 1.1.1)
   bootstrap-sass (= 2.3.2.2)
   capybara (= 2.4.1)

From 25f117f8d8a566b8ed80e020b7a76e0d13ad08e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:02:22 +0200
Subject: [PATCH 03/27] bump devise

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 883cff3d8..8e1231d12 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ gem 'json',        '1.8.1'
 
 # Authentication
 
-gem 'devise', '3.2.4'
+gem 'devise', '3.3.0'
 gem 'devise_lastseenable', '0.0.4'
 
 # Captcha
diff --git a/Gemfile.lock b/Gemfile.lock
index e85ef0ea3..457f27721 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -109,7 +109,7 @@ GEM
       nokogiri (~> 1.5)
       rails (>= 3, < 5)
     database_cleaner (1.3.0)
-    devise (3.2.4)
+    devise (3.3.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -496,7 +496,7 @@ DEPENDENCIES
   configurate (= 0.0.8)
   cucumber-rails (= 1.4.1)
   database_cleaner (= 1.3.0)
-  devise (= 3.2.4)
+  devise (= 3.3.0)
   devise_lastseenable (= 0.0.4)
   entypo-rails (= 2.2.2)
   factory_girl_rails (= 4.4.1)

From b0bf570cd97d8884f13378467313969e192f79b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:02:48 +0200
Subject: [PATCH 04/27] bump fog

---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8e1231d12..bccf1c22a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,7 +62,7 @@ gem 'foreigner',           '1.6.1'
 # File uploading
 
 gem 'carrierwave', '0.10.0'
-gem 'fog',         '1.22.1'
+gem 'fog',         '1.23.0'
 gem 'mini_magick', '3.7.0'
 gem 'remotipart',  '1.2.1'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 457f27721..7d10fcbf9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -150,10 +150,11 @@ GEM
     fixture_builder (0.3.6)
       activerecord (>= 2)
       activesupport (>= 2)
-    fog (1.22.1)
+    fog (1.23.0)
       fog-brightbox
-      fog-core (~> 1.22)
+      fog-core (~> 1.23)
       fog-json
+      fog-softlayer
       ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
     fog-brightbox (0.3.0)
@@ -169,6 +170,9 @@ GEM
       net-ssh (>= 2.1.3)
     fog-json (1.0.0)
       multi_json (~> 1.0)
+    fog-softlayer (0.3.15)
+      fog-core
+      fog-json
     font-awesome-rails (4.0.3.1)
       railties (>= 3.2, < 5.0)
     foreigner (1.6.1)
@@ -503,7 +507,7 @@ DEPENDENCIES
   faraday (= 0.8.9)
   faraday_middleware (= 0.9.0)
   fixture_builder (= 0.3.6)
-  fog (= 1.22.1)
+  fog (= 1.23.0)
   foreigner (= 1.6.1)
   foreman (= 0.62)
   fuubar (= 1.3.3)

From ebf43c195605ad2586b8e8bf2a55a5ae095c887a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:05:56 +0200
Subject: [PATCH 05/27] bump gon

---
 Gemfile      | 2 +-
 Gemfile.lock | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index bccf1c22a..7e6515955 100644
--- a/Gemfile
+++ b/Gemfile
@@ -122,7 +122,7 @@ gem 'typhoeus',           '0.6.8'
 
 # Views
 
-gem 'gon',                     '5.0.4'
+gem 'gon',                     '5.1.2'
 gem 'haml',                    '4.0.5'
 gem 'mobile-fu',               '1.3.1'
 gem 'will_paginate',           '3.0.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7d10fcbf9..7a44c583e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -186,9 +186,11 @@ GEM
       ruby-progressbar (~> 1.4)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    gon (5.0.4)
+    gon (5.1.2)
       actionpack (>= 2.3.0)
       json
+      multi_json
+      request_store (>= 1.0.5)
     guard (2.2.5)
       formatador (>= 0.2.4)
       listen (~> 2.1)
@@ -377,6 +379,7 @@ GEM
     redis-namespace (1.5.1)
       redis (~> 3.0, >= 3.0.4)
     remotipart (1.2.1)
+    request_store (1.1.0)
     roxml (3.1.6)
       activesupport (>= 2.3.0)
       nokogiri (>= 1.3.3)
@@ -511,7 +514,7 @@ DEPENDENCIES
   foreigner (= 1.6.1)
   foreman (= 0.62)
   fuubar (= 1.3.3)
-  gon (= 5.0.4)
+  gon (= 5.1.2)
   guard-cucumber (= 1.4.1)
   guard-rspec (= 4.2.9)
   guard-spork (= 1.5.1)

From 59d1076e31d237e7ea2751ff090c92e3e3744b44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:06:31 +0200
Subject: [PATCH 06/27] bump guard-rspec

---
 Gemfile      |  2 +-
 Gemfile.lock | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7e6515955..66f58057f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -172,7 +172,7 @@ end
 group :development do
   # Automatic test runs
   gem 'guard-cucumber', '1.4.1'
-  gem 'guard-rspec',    '4.2.9'
+  gem 'guard-rspec',    '4.3.1'
   gem 'rb-fsevent',     '0.9.4', :require => false
   gem 'rb-inotify',     '0.9.4', :require => false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 7a44c583e..5297cd306 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -191,16 +191,16 @@ GEM
       json
       multi_json
       request_store (>= 1.0.5)
-    guard (2.2.5)
+    guard (2.6.1)
       formatador (>= 0.2.4)
-      listen (~> 2.1)
+      listen (~> 2.7)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
     guard-cucumber (1.4.1)
       cucumber (>= 1.2.0)
       guard (>= 1.1.0)
-    guard-rspec (4.2.9)
+    guard-rspec (4.3.1)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
     guard-spork (1.5.1)
@@ -245,11 +245,11 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.9.2)
-    listen (2.4.0)
+    listen (2.7.9)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lumberjack (1.0.4)
+    lumberjack (1.0.9)
     macaddr (1.7.1)
       systemu (~> 2.6.2)
     mail (2.5.4)
@@ -308,9 +308,9 @@ GEM
     orm_adapter (0.5.0)
     phantomjs (1.9.7.1)
     polyglot (0.3.5)
-    pry (0.9.12.4)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
     rack (1.5.2)
     rack-cors (0.2.9)
@@ -430,7 +430,7 @@ GEM
       tilt (~> 1.3, >= 1.3.3)
     sinon-rails (1.9.0)
       railties (>= 3.1)
-    slop (3.4.7)
+    slop (3.6.0)
     spork (1.0.0rc4)
     sprockets (2.11.0)
       hike (~> 1.2)
@@ -516,7 +516,7 @@ DEPENDENCIES
   fuubar (= 1.3.3)
   gon (= 5.1.2)
   guard-cucumber (= 1.4.1)
-  guard-rspec (= 4.2.9)
+  guard-rspec (= 4.3.1)
   guard-spork (= 1.5.1)
   haml (= 4.0.5)
   handlebars_assets (= 0.12.0)

From 047a05f74cfdf5151e9c109d94b55f872a6b9cd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:06:57 +0200
Subject: [PATCH 07/27] bump mini_magick

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 66f58057f..8590b4a0f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -63,7 +63,7 @@ gem 'foreigner',           '1.6.1'
 
 gem 'carrierwave', '0.10.0'
 gem 'fog',         '1.23.0'
-gem 'mini_magick', '3.7.0'
+gem 'mini_magick', '3.8.0'
 gem 'remotipart',  '1.2.1'
 
 # GUID generation
diff --git a/Gemfile.lock b/Gemfile.lock
index 5297cd306..f0a696415 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -260,7 +260,7 @@ GEM
     messagebus_ruby_api (1.0.3)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_magick (3.7.0)
+    mini_magick (3.8.0)
       subexec (~> 0.2.1)
     mini_portile (0.5.3)
     minitest (5.4.0)
@@ -528,7 +528,7 @@ DEPENDENCIES
   json (= 1.8.1)
   markerb (= 1.0.2)
   messagebus_ruby_api (= 1.0.3)
-  mini_magick (= 3.7.0)
+  mini_magick (= 3.8.0)
   mobile-fu (= 1.3.1)
   mysql2 (= 0.3.16)
   nokogiri (= 1.6.1)

From 9cd010009003518dc999fbaf7db94525797ce832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:16:36 +0200
Subject: [PATCH 08/27] bump rack-piwik

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8590b4a0f..cd8b651c5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -149,7 +149,7 @@ group :production do # we don't install these on travis to speed up test runs
   # Analytics
 
   gem 'rack-google-analytics', '0.14.0', :require => 'rack/google-analytics'
-  gem 'rack-piwik',            '0.2.2',  :require => 'rack/piwik'
+  gem 'rack-piwik',            '0.3.0',  :require => 'rack/piwik'
 
   # Click-jacking protection
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f0a696415..2c7b62b87 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -319,7 +319,7 @@ GEM
       activesupport
     rack-mobile-detect (0.4.0)
       rack
-    rack-piwik (0.2.2)
+    rack-piwik (0.3.0)
     rack-pjax (0.7.0)
       nokogiri (~> 1.5)
       rack (~> 1.3)
@@ -540,7 +540,7 @@ DEPENDENCIES
   opengraph_parser (= 0.2.3)
   rack-cors (= 0.2.9)
   rack-google-analytics (= 0.14.0)
-  rack-piwik (= 0.2.2)
+  rack-piwik (= 0.3.0)
   rack-protection (= 1.2)
   rack-rewrite (= 1.5.0)
   rack-ssl (= 1.4.1)

From 6c0ee4c78d8cc93b2a507256daab7d9d7303fd68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:17:06 +0200
Subject: [PATCH 09/27] bump rails_admin

---
 Gemfile      |  2 +-
 Gemfile.lock | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index cd8b651c5..d17873dc6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -144,7 +144,7 @@ group :production do # we don't install these on travis to speed up test runs
 
   # Administration
 
-  gem 'rails_admin', '0.6.2'
+  gem 'rails_admin', '0.6.3'
 
   # Analytics
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 2c7b62b87..a82e03744 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,10 +82,10 @@ GEM
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
+    coffee-script-source (1.7.1)
     compass (0.12.7)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
@@ -135,8 +135,7 @@ GEM
     ethon (0.7.1)
       ffi (>= 1.3.0)
     excon (0.39.5)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.2.1)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.4.1)
@@ -173,7 +172,7 @@ GEM
     fog-softlayer (0.3.15)
       fog-core
       fog-json
-    font-awesome-rails (4.0.3.1)
+    font-awesome-rails (4.1.0.0)
       railties (>= 3.2, < 5.0)
     foreigner (1.6.1)
       activerecord (>= 3.0.0)
@@ -236,12 +235,12 @@ GEM
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.2.0)
+    jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
     json (1.8.1)
     jwt (0.1.10)
       multi_json (>= 1.5)
-    kaminari (0.15.1)
+    kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.9.2)
@@ -320,9 +319,9 @@ GEM
     rack-mobile-detect (0.4.0)
       rack
     rack-piwik (0.3.0)
-    rack-pjax (0.7.0)
+    rack-pjax (0.8.0)
       nokogiri (~> 1.5)
-      rack (~> 1.3)
+      rack (~> 1.1)
     rack-protection (1.2.0)
       rack
     rack-rewrite (1.5.0)
@@ -348,7 +347,7 @@ GEM
     rails-timeago (2.4.0)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
-    rails_admin (0.6.2)
+    rails_admin (0.6.3)
       builder (~> 3.1)
       coffee-rails (~> 4.0)
       font-awesome-rails (>= 3.0)
@@ -547,7 +546,7 @@ DEPENDENCIES
   rails (= 4.1.5)
   rails-i18n (= 4.0.2)
   rails-timeago (= 2.4.0)
-  rails_admin (= 0.6.2)
+  rails_admin (= 0.6.3)
   rails_autolink (= 1.1.5)
   rb-fsevent (= 0.9.4)
   rb-inotify (= 0.9.4)

From 3fc8be03af8fbccc767f09ca235d3ada917244c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:17:36 +0200
Subject: [PATCH 10/27] bump rb-inotify

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index d17873dc6..760b29975 100644
--- a/Gemfile
+++ b/Gemfile
@@ -174,7 +174,7 @@ group :development do
   gem 'guard-cucumber', '1.4.1'
   gem 'guard-rspec',    '4.3.1'
   gem 'rb-fsevent',     '0.9.4', :require => false
-  gem 'rb-inotify',     '0.9.4', :require => false
+  gem 'rb-inotify',     '0.9.5', :require => false
 
   # Preloading environment
 
diff --git a/Gemfile.lock b/Gemfile.lock
index a82e03744..592f98918 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -371,7 +371,7 @@ GEM
     raindrops (0.13.0)
     rake (10.3.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     redcarpet (3.1.2)
     redis (3.1.0)
@@ -549,7 +549,7 @@ DEPENDENCIES
   rails_admin (= 0.6.3)
   rails_autolink (= 1.1.5)
   rb-fsevent (= 0.9.4)
-  rb-inotify (= 0.9.4)
+  rb-inotify (= 0.9.5)
   redcarpet (= 3.1.2)
   remotipart (= 1.2.1)
   roxml (= 3.1.6)

From 02bb317df028892afcc363fdfe51d7e8dd40a35f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:18:28 +0200
Subject: [PATCH 11/27] bump rspec-instafail

---
 Gemfile      | 2 +-
 Gemfile.lock | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 760b29975..6ff9cd283 100644
--- a/Gemfile
+++ b/Gemfile
@@ -187,7 +187,7 @@ group :test do
 
   gem 'fixture_builder',   '0.3.6'
   gem 'fuubar',            '1.3.3'
-  gem 'rspec-instafail',   '0.2.4', :require => false
+  gem 'rspec-instafail',   '0.2.5', :require => false
   gem 'test_after_commit', '0.2.3'
 
   # Cucumber (integration tests)
diff --git a/Gemfile.lock b/Gemfile.lock
index 592f98918..999cbfe06 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -389,7 +389,8 @@ GEM
     rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-instafail (0.2.4)
+    rspec-instafail (0.2.5)
+      rspec
     rspec-mocks (2.14.6)
     rspec-rails (2.14.2)
       actionpack (>= 3.0)
@@ -553,7 +554,7 @@ DEPENDENCIES
   redcarpet (= 3.1.2)
   remotipart (= 1.2.1)
   roxml (= 3.1.6)
-  rspec-instafail (= 0.2.4)
+  rspec-instafail (= 0.2.5)
   rspec-rails (= 2.14.2)
   ruby-oembed (= 0.8.9)
   sass-rails (= 4.0.3)

From a974f281e854614f047e1a6eee7e130f3a512e9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:19:26 +0200
Subject: [PATCH 12/27] bump ruby-oembed

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6ff9cd283..7aec3c624 100644
--- a/Gemfile
+++ b/Gemfile
@@ -96,7 +96,7 @@ gem 'nokogiri',         '1.6.1'
 gem 'rails_autolink',   '1.1.5'
 gem 'redcarpet',        '3.1.2'
 gem 'roxml',            '3.1.6'
-gem 'ruby-oembed',      '0.8.9'
+gem 'ruby-oembed',      '0.8.10'
 gem 'opengraph_parser', '0.2.3'
 
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 999cbfe06..bd9dbffa4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -400,7 +400,7 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    ruby-oembed (0.8.9)
+    ruby-oembed (0.8.10)
     ruby-progressbar (1.5.1)
     rubyzip (1.1.4)
     safe_yaml (1.0.3)
@@ -556,7 +556,7 @@ DEPENDENCIES
   roxml (= 3.1.6)
   rspec-instafail (= 0.2.5)
   rspec-rails (= 2.14.2)
-  ruby-oembed (= 0.8.9)
+  ruby-oembed (= 0.8.10)
   sass-rails (= 4.0.3)
   selenium-webdriver (= 2.42.0)
   sidekiq (= 2.17.7)

From 5fa8d7c44caa710f40f534a791d65bdee7020581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:24:22 +0200
Subject: [PATCH 13/27] bump test_after_commit

---
 Gemfile      | 2 +-
 Gemfile.lock | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7aec3c624..e5c4e805b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -188,7 +188,7 @@ group :test do
   gem 'fixture_builder',   '0.3.6'
   gem 'fuubar',            '1.3.3'
   gem 'rspec-instafail',   '0.2.5', :require => false
-  gem 'test_after_commit', '0.2.3'
+  gem 'test_after_commit', '0.2.5'
 
   # Cucumber (integration tests)
 
diff --git a/Gemfile.lock b/Gemfile.lock
index bd9dbffa4..88711605c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -443,7 +443,8 @@ GEM
       sprockets (~> 2.8)
     subexec (0.2.3)
     systemu (2.6.4)
-    test_after_commit (0.2.3)
+    test_after_commit (0.2.5)
+      activerecord (>= 3.2)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
@@ -564,7 +565,7 @@ DEPENDENCIES
   sinatra (= 1.3.3)
   sinon-rails (= 1.9.0)
   spork (= 1.0.0rc4)
-  test_after_commit (= 0.2.3)
+  test_after_commit (= 0.2.5)
   timecop (= 0.7.1)
   twitter (= 4.8.1)
   typhoeus (= 0.6.8)

From b3f18e1961c4ddd1c861c89ea0fd8da7571f9746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:26:28 +0200
Subject: [PATCH 14/27] bump typhoeus

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index e5c4e805b..b6a5721ba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -118,7 +118,7 @@ gem 'acts-as-taggable-on', '3.3.0'
 gem 'addressable',        '2.3.6', :require => 'addressable/uri'
 gem 'faraday',            '0.8.9'
 gem 'faraday_middleware', '0.9.0'
-gem 'typhoeus',           '0.6.8'
+gem 'typhoeus',           '0.6.9'
 
 # Views
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 88711605c..4e43e800c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -457,8 +457,8 @@ GEM
       faraday (~> 0.8, < 0.10)
       multi_json (~> 1.0)
       simple_oauth (~> 0.2)
-    typhoeus (0.6.8)
-      ethon (>= 0.7.0)
+    typhoeus (0.6.9)
+      ethon (>= 0.7.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.5.0)
@@ -568,7 +568,7 @@ DEPENDENCIES
   test_after_commit (= 0.2.5)
   timecop (= 0.7.1)
   twitter (= 4.8.1)
-  typhoeus (= 0.6.8)
+  typhoeus (= 0.6.9)
   uglifier (= 2.5.0)
   unicorn (= 4.8.3)
   uuid (= 2.3.7)

From 4415d91aa6f1b47de131f5f270e5d15ad7d8fda5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:27:09 +0200
Subject: [PATCH 15/27] bump uglifier

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index b6a5721ba..bac805ac6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@ gem 'sinatra', '1.3.3'
 
 # Compression
 
-gem 'uglifier', '2.5.0'
+gem 'uglifier', '2.5.3'
 
 # Configuration
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4e43e800c..a51d97faa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -461,7 +461,7 @@ GEM
       ethon (>= 0.7.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.5.0)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unf (0.1.4)
@@ -569,7 +569,7 @@ DEPENDENCIES
   timecop (= 0.7.1)
   twitter (= 4.8.1)
   typhoeus (= 0.6.9)
-  uglifier (= 2.5.0)
+  uglifier (= 2.5.3)
   unicorn (= 4.8.3)
   uuid (= 2.3.7)
   webmock (= 1.18.0)

From 4da21d02dba65236eb0e41aa84d9fa514a8065af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:27:39 +0200
Subject: [PATCH 16/27] bump will_paginate

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index bac805ac6..4b054d15d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -125,7 +125,7 @@ gem 'typhoeus',           '0.6.9'
 gem 'gon',                     '5.1.2'
 gem 'haml',                    '4.0.5'
 gem 'mobile-fu',               '1.3.1'
-gem 'will_paginate',           '3.0.5'
+gem 'will_paginate',           '3.0.7'
 gem 'rails-timeago',           '2.4.0'
 
 # Workarounds
diff --git a/Gemfile.lock b/Gemfile.lock
index a51d97faa..16a794c35 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -479,7 +479,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
     websocket (1.0.7)
-    will_paginate (3.0.5)
+    will_paginate (3.0.7)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     zip-zip (0.2)
@@ -573,5 +573,5 @@ DEPENDENCIES
   unicorn (= 4.8.3)
   uuid (= 2.3.7)
   webmock (= 1.18.0)
-  will_paginate (= 3.0.5)
+  will_paginate (= 3.0.7)
   zip-zip

From 67331a7371b450b319977e8271add52b656e728e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:28:46 +0200
Subject: [PATCH 17/27] bump rails_autolink

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4b054d15d..fc754c94a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,7 +93,7 @@ gem 'messagebus_ruby_api', '1.0.3'
 # Parsing
 
 gem 'nokogiri',         '1.6.1'
-gem 'rails_autolink',   '1.1.5'
+gem 'rails_autolink',   '1.1.6'
 gem 'redcarpet',        '3.1.2'
 gem 'roxml',            '3.1.6'
 gem 'ruby-oembed',      '0.8.10'
diff --git a/Gemfile.lock b/Gemfile.lock
index 16a794c35..6dc921465 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -361,7 +361,7 @@ GEM
       remotipart (~> 1.0)
       safe_yaml (~> 1.0)
       sass-rails (~> 4.0)
-    rails_autolink (1.1.5)
+    rails_autolink (1.1.6)
       rails (> 3.1)
     railties (4.1.5)
       actionpack (= 4.1.5)
@@ -549,7 +549,7 @@ DEPENDENCIES
   rails-i18n (= 4.0.2)
   rails-timeago (= 2.4.0)
   rails_admin (= 0.6.3)
-  rails_autolink (= 1.1.5)
+  rails_autolink (= 1.1.6)
   rb-fsevent (= 0.9.4)
   rb-inotify (= 0.9.5)
   redcarpet (= 3.1.2)

From 66521a36f6bf9cab2aa597ce84cb46d7d1ff69f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:29:17 +0200
Subject: [PATCH 18/27] bump zip-zip

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6dc921465..e86e906cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -402,7 +402,7 @@ GEM
       rspec-mocks (~> 2.14.0)
     ruby-oembed (0.8.10)
     ruby-progressbar (1.5.1)
-    rubyzip (1.1.4)
+    rubyzip (1.1.6)
     safe_yaml (1.0.3)
     sass (3.2.19)
     sass-rails (4.0.3)
@@ -482,7 +482,7 @@ GEM
     will_paginate (3.0.7)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    zip-zip (0.2)
+    zip-zip (0.3)
       rubyzip (>= 1.0.0)
 
 PLATFORMS

From 589794a43884bfc9161cc953b33504a3735402d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:31:13 +0200
Subject: [PATCH 19/27] bump omniauth-oauth2

---
 Gemfile.lock | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e86e906cc..ced74eda7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -215,7 +215,6 @@ GEM
     hashie (2.1.2)
     hike (1.2.3)
     http_accept_language (1.0.2)
-    httpauth (0.2.0)
     i18n (0.6.11)
     i18n-inflector (2.6.7)
       i18n (>= 0.4.1)
@@ -238,8 +237,7 @@ GEM
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
     json (1.8.1)
-    jwt (0.1.10)
-      multi_json (>= 1.5)
+    jwt (1.0.0)
     kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -268,6 +266,7 @@ GEM
       rails
     multi_json (1.10.1)
     multi_test (0.1.1)
+    multi_xml (0.5.5)
     multipart-post (1.2.0)
     mysql2 (0.3.16)
     nested_form (0.3.2)
@@ -277,11 +276,11 @@ GEM
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     oauth (0.4.7)
-    oauth2 (0.8.1)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    oauth2 (0.9.4)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
       rack (~> 1.2)
     omniauth (1.2.1)
       hashie (>= 1.2, < 3)
@@ -291,9 +290,11 @@ GEM
     omniauth-oauth (1.0.1)
       oauth
       omniauth (~> 1.0)
-    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)
     omniauth-tumblr (1.1)
       omniauth-oauth (~> 1.0)
     omniauth-twitter (1.0.1)

From 328d53230d3fe3132262c429940aa73ded3ed305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:31:28 +0200
Subject: [PATCH 20/27] bump connection_pool

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ced74eda7..8fdbac012 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -93,7 +93,7 @@ GEM
     compass-rails (2.0.0)
       compass (>= 0.12.2)
     configurate (0.0.8)
-    connection_pool (1.2.0)
+    connection_pool (2.0.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     cucumber (1.3.16)

From ac998407b58336d8e4607d70c2f6cb5ca9a3eb6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:31:46 +0200
Subject: [PATCH 21/27] bump jasmine-core

---
 Gemfile.lock                                             | 2 +-
 spec/javascripts/app/views/aspects_dropdown_view_spec.js | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8fdbac012..a28e6f2d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -229,7 +229,7 @@ GEM
       phantomjs
       rack (>= 1.2.1)
       rake
-    jasmine-core (2.0.0)
+    jasmine-core (2.0.2)
     jasmine-jquery-rails (2.0.3)
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
diff --git a/spec/javascripts/app/views/aspects_dropdown_view_spec.js b/spec/javascripts/app/views/aspects_dropdown_view_spec.js
index 6c017ccd5..326d6a583 100644
--- a/spec/javascripts/app/views/aspects_dropdown_view_spec.js
+++ b/spec/javascripts/app/views/aspects_dropdown_view_spec.js
@@ -1,6 +1,10 @@
 describe("app.views.AspectsDropdown", function(){
   beforeEach(function() {
     spec.loadFixture("bookmarklet");
+    Diaspora.I18n.load({
+      'aspect_dropdown': {
+        'select_aspects': "Select aspects"
+    });
     this.view = new app.views.AspectsDropdown({el: $('.aspect_dropdown')});
   });
 
@@ -69,7 +73,7 @@ describe("app.views.AspectsDropdown", function(){
       expect(this.view.$('li.aspect_selector:eq(1)').hasClass('selected')).toBeTruthy();
     });
   });
-  
+
   context('_updateButton', function() {
     beforeEach(function() {
       this.view.$('li.selected').removeClass('selected');

From 8de29bc28d97d8413db1bbc65222771ddf6ed07d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 21:08:56 +0200
Subject: [PATCH 22/27] bump faraday and faraday_middleware. closes #4950

---
 Gemfile                        |  4 ++--
 Gemfile.lock                   | 14 +++++++-------
 config/initializers/faraday.rb |  4 +++-
 lib/diaspora/fetcher/public.rb |  4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index fc754c94a..5ff8b8908 100644
--- a/Gemfile
+++ b/Gemfile
@@ -116,8 +116,8 @@ gem 'acts-as-taggable-on', '3.3.0'
 # URIs and HTTP
 
 gem 'addressable',        '2.3.6', :require => 'addressable/uri'
-gem 'faraday',            '0.8.9'
-gem 'faraday_middleware', '0.9.0'
+gem 'faraday',            '0.9.0'
+gem 'faraday_middleware', '0.9.1'
 gem 'typhoeus',           '0.6.9'
 
 # Views
diff --git a/Gemfile.lock b/Gemfile.lock
index a28e6f2d7..e039c78f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -141,10 +141,10 @@ GEM
     factory_girl_rails (4.4.1)
       factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.9.1)
+      faraday (>= 0.7.4, < 0.10)
     ffi (1.9.3)
     fixture_builder (0.3.6)
       activerecord (>= 2)
@@ -267,7 +267,7 @@ GEM
     multi_json (1.10.1)
     multi_test (0.1.1)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
+    multipart-post (2.0.0)
     mysql2 (0.3.16)
     nested_form (0.3.2)
     net-scp (1.2.1)
@@ -509,8 +509,8 @@ DEPENDENCIES
   devise_lastseenable (= 0.0.4)
   entypo-rails (= 2.2.2)
   factory_girl_rails (= 4.4.1)
-  faraday (= 0.8.9)
-  faraday_middleware (= 0.9.0)
+  faraday (= 0.9.0)
+  faraday_middleware (= 0.9.1)
   fixture_builder (= 0.3.6)
   fog (= 1.23.0)
   foreigner (= 1.6.1)
diff --git a/config/initializers/faraday.rb b/config/initializers/faraday.rb
index 274a998b5..ad1384f6d 100644
--- a/config/initializers/faraday.rb
+++ b/config/initializers/faraday.rb
@@ -2,7 +2,9 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 options = {
-  timeout: 25,
+  request: {
+    timeout: 25
+  },
   ssl: {
     ca_file: AppConfig.environment.certificate_authorities.get
   }
diff --git a/lib/diaspora/fetcher/public.rb b/lib/diaspora/fetcher/public.rb
index a849a9071..241928246 100644
--- a/lib/diaspora/fetcher/public.rb
+++ b/lib/diaspora/fetcher/public.rb
@@ -76,8 +76,8 @@ module Diaspora; module Fetcher; class Public
       FEDERATION_LOGGER.info "fetching public posts for #{@person.diaspora_handle}"
 
       resp = Faraday.get("#{@person.url}people/#{@person.guid}") do |req|
-        req.headers[:accept] = 'application/json'
-        req.headers[:user_agent] = 'diaspora-fetcher'
+        req.headers['Accept'] = 'application/json'
+        req.headers['User-Agent'] = 'diaspora-fetcher'
       end
 
       FEDERATION_LOGGER.debug resp.body.to_s[0..250]

From b34fe4199bb03e88d3b4da713275515ea16cc64e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Mon, 25 Aug 2014 19:20:50 +0200
Subject: [PATCH 23/27] bump simple_captcha2

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5ff8b8908..ed09109de 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ gem 'devise_lastseenable', '0.0.4'
 
 # Captcha
 
-gem 'simple_captcha2', '0.2.1', :require => 'simple_captcha'
+gem 'simple_captcha2', '0.3.2', :require => 'simple_captcha'
 
 # Background processing
 
diff --git a/Gemfile.lock b/Gemfile.lock
index e039c78f0..1dddef0d8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -422,8 +422,8 @@ GEM
       json
       redis (>= 3.0.6)
       redis-namespace (>= 1.3.1)
-    simple_captcha2 (0.2.1)
-      rails (>= 3.1)
+    simple_captcha2 (0.3.2)
+      rails (>= 4.1)
     simple_oauth (0.2.0)
     sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
@@ -562,7 +562,7 @@ DEPENDENCIES
   sass-rails (= 4.0.3)
   selenium-webdriver (= 2.42.0)
   sidekiq (= 2.17.7)
-  simple_captcha2 (= 0.2.1)
+  simple_captcha2 (= 0.3.2)
   sinatra (= 1.3.3)
   sinon-rails (= 1.9.0)
   spork (= 1.0.0rc4)

From 37f062c07f3589874fc3ef0fe76587ac513d928a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Mon, 25 Aug 2014 21:37:34 +0200
Subject: [PATCH 24/27] bump sinon-rails

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index ed09109de..abbb41abb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -214,5 +214,5 @@ group :development, :test do
   # Jasmine (client side application tests (JS))
   gem 'jasmine',              '2.0.2'
   gem 'jasmine-jquery-rails', '2.0.3'
-  gem 'sinon-rails',	      '1.9.0'
+  gem 'sinon-rails',	      '1.10.3'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 1dddef0d8..e2d8fc876 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -345,7 +345,7 @@ GEM
       rails (>= 4.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
-    rails-timeago (2.4.0)
+    rails-timeago (2.11.0)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
     rails_admin (0.6.3)
@@ -429,7 +429,7 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    sinon-rails (1.9.0)
+    sinon-rails (1.10.3)
       railties (>= 3.1)
     slop (3.6.0)
     spork (1.0.0rc4)
@@ -548,7 +548,7 @@ DEPENDENCIES
   rack-ssl (= 1.4.1)
   rails (= 4.1.5)
   rails-i18n (= 4.0.2)
-  rails-timeago (= 2.4.0)
+  rails-timeago (= 2.11.0)
   rails_admin (= 0.6.3)
   rails_autolink (= 1.1.6)
   rb-fsevent (= 0.9.4)
@@ -564,7 +564,7 @@ DEPENDENCIES
   sidekiq (= 2.17.7)
   simple_captcha2 (= 0.3.2)
   sinatra (= 1.3.3)
-  sinon-rails (= 1.9.0)
+  sinon-rails (= 1.10.3)
   spork (= 1.0.0rc4)
   test_after_commit (= 0.2.5)
   timecop (= 0.7.1)

From eb3fbc35b2c8e5a46b26f753954920a8f38fb08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Mon, 25 Aug 2014 21:40:15 +0200
Subject: [PATCH 25/27] bump rails-timeago

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index abbb41abb..d2c203fc8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -126,7 +126,7 @@ gem 'gon',                     '5.1.2'
 gem 'haml',                    '4.0.5'
 gem 'mobile-fu',               '1.3.1'
 gem 'will_paginate',           '3.0.7'
-gem 'rails-timeago',           '2.4.0'
+gem 'rails-timeago',           '2.11.0'
 
 # Workarounds
 # https://github.com/rubyzip/rubyzip#important-note

From 5ffbafa56ade22434af8427fdfd6c22537c5580c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Mon, 25 Aug 2014 21:49:46 +0200
Subject: [PATCH 26/27] bump rack-google-analytics

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index d2c203fc8..92cd9a709 100644
--- a/Gemfile
+++ b/Gemfile
@@ -148,7 +148,7 @@ group :production do # we don't install these on travis to speed up test runs
 
   # Analytics
 
-  gem 'rack-google-analytics', '0.14.0', :require => 'rack/google-analytics'
+  gem 'rack-google-analytics', '1.2.0'
   gem 'rack-piwik',            '0.3.0',  :require => 'rack/piwik'
 
   # Click-jacking protection
diff --git a/Gemfile.lock b/Gemfile.lock
index e2d8fc876..d95142085 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -314,7 +314,7 @@ GEM
       slop (~> 3.4)
     rack (1.5.2)
     rack-cors (0.2.9)
-    rack-google-analytics (0.14.0)
+    rack-google-analytics (1.2.0)
       actionpack
       activesupport
     rack-mobile-detect (0.4.0)
@@ -541,7 +541,7 @@ DEPENDENCIES
   omniauth-wordpress (= 0.2.1)
   opengraph_parser (= 0.2.3)
   rack-cors (= 0.2.9)
-  rack-google-analytics (= 0.14.0)
+  rack-google-analytics (= 1.2.0)
   rack-piwik (= 0.3.0)
   rack-protection (= 1.2)
   rack-rewrite (= 1.5.0)

From ef214d76816b06a4211077b78f70a14e4ada46dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Mon, 25 Aug 2014 21:52:54 +0200
Subject: [PATCH 27/27] bump http_accept_language

---
 Gemfile                                   | 2 +-
 Gemfile.lock                              | 4 ++--
 app/controllers/application_controller.rb | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 92cd9a709..0b19184cf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -81,7 +81,7 @@ gem 'jquery-rails',      '3.0.4'
 
 # Localization
 
-gem 'http_accept_language', '1.0.2'
+gem 'http_accept_language', '2.0.2'
 gem 'i18n-inflector-rails', '1.0.7'
 gem 'rails-i18n',           '4.0.2'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index d95142085..f0f96ccfd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -214,7 +214,7 @@ GEM
       tilt
     hashie (2.1.2)
     hike (1.2.3)
-    http_accept_language (1.0.2)
+    http_accept_language (2.0.2)
     i18n (0.6.11)
     i18n-inflector (2.6.7)
       i18n (>= 0.4.1)
@@ -522,7 +522,7 @@ DEPENDENCIES
   guard-spork (= 1.5.1)
   haml (= 4.0.5)
   handlebars_assets (= 0.12.0)
-  http_accept_language (= 1.0.2)
+  http_accept_language (= 2.0.2)
   i18n-inflector-rails (= 1.0.7)
   jasmine (= 2.0.2)
   jasmine-jquery-rails (= 2.0.3)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 73a3a35cf..f95636f60 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -80,8 +80,7 @@ class ApplicationController < ActionController::Base
     if user_signed_in?
       I18n.locale = current_user.language
     else
-      locale = request.preferred_language_from AVAILABLE_LANGUAGE_CODES
-      locale ||= request.compatible_language_from AVAILABLE_LANGUAGE_CODES
+      locale = http_accept_language.language_region_compatible_from AVAILABLE_LANGUAGE_CODES
       locale ||= DEFAULT_LANGUAGE
       I18n.locale = locale
     end