From a30295dcc6fd0926387271f79e5bb35a82565ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:06:02 +0100
Subject: [PATCH 01/17] bump acts-as-taggable-on

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

diff --git a/Gemfile b/Gemfile
index 1983f935e..d2bf6ec8a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -149,7 +149,7 @@ gem "rails-assets-diaspora_jsxc", "~> 0.1.1", source: "https://rails-assets.org"
 
 # Tags
 
-gem "acts-as-taggable-on", "3.4.4"
+gem "acts-as-taggable-on", "3.5.0"
 
 # URIs and HTTP
 
diff --git a/Gemfile.lock b/Gemfile.lock
index d126b59e6..4ebef09a2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,7 +50,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    acts-as-taggable-on (3.4.4)
+    acts-as-taggable-on (3.5.0)
       activerecord (>= 3.2, < 5)
     acts_as_api (0.4.2)
       activemodel (>= 3.0.0)
@@ -707,7 +707,7 @@ DEPENDENCIES
   actionpack-page_caching
   active_model_serializers (= 0.9.3)
   activerecord-import (= 0.7.0)
-  acts-as-taggable-on (= 3.4.4)
+  acts-as-taggable-on (= 3.5.0)
   acts_as_api (= 0.4.2)
   addressable (= 2.3.7)
   asset_sync (= 1.1.0)

From f0b7d68399a3784bcd769157bf854c09c852bca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:11:08 +0100
Subject: [PATCH 02/17] bump autoprefixer-rails

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

diff --git a/Gemfile b/Gemfile
index d2bf6ec8a..e0894414e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -56,7 +56,7 @@ gem "rack-cors", "0.3.1", require: "rack/cors"
 gem "bootstrap-sass", "2.3.2.2"
 gem "compass-rails",  "2.0.4"
 gem "sass-rails",     "5.0.1"
-gem "autoprefixer-rails", "5.1.7"
+gem "autoprefixer-rails", "5.1.7.1"
 
 # Database
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4ebef09a2..e70642af5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -65,7 +65,7 @@ GEM
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
-    autoprefixer-rails (5.1.7)
+    autoprefixer-rails (5.1.7.1)
       execjs
       json
     backbone-on-rails (1.1.2.0)
@@ -186,7 +186,7 @@ GEM
       ffi (>= 1.3.0)
     eventmachine (1.0.7)
     excon (0.44.3)
-    execjs (2.3.0)
+    execjs (2.4.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
@@ -711,7 +711,7 @@ DEPENDENCIES
   acts_as_api (= 0.4.2)
   addressable (= 2.3.7)
   asset_sync (= 1.1.0)
-  autoprefixer-rails (= 5.1.7)
+  autoprefixer-rails (= 5.1.7.1)
   backbone-on-rails (= 1.1.2)
   bootstrap-sass (= 2.3.2.2)
   capybara (= 2.4.4)

From 9f6ca586a1dad7e56c2600f54993d5d57cc0a66b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:12:51 +0100
Subject: [PATCH 03/17] bump guard

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

diff --git a/Gemfile b/Gemfile
index e0894414e..151f9188c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -215,11 +215,11 @@ end
 
 group :development do
   # Automatic test runs
-  gem "guard-cucumber", "1.5.3"
+  gem "guard-cucumber", "1.5.4"
   gem "guard-jshintrb", "1.1.1"
   gem "guard-rspec",    "4.5.0"
   gem "guard-rubocop",  "1.2.0"
-  gem "guard",          "2.12.4", require: false
+  gem "guard",          "2.12.5", require: false
   gem "rb-fsevent",     "0.9.4", require: false
   gem "rb-inotify",     "0.9.5", require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index e70642af5..6b7bebaed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -199,7 +199,7 @@ GEM
       http-cookie (~> 1.0.0)
     faraday_middleware (0.9.1)
       faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.6)
+    ffi (1.9.8)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
     fixture_builder (0.3.6)
@@ -302,7 +302,7 @@ GEM
       json
       multi_json
       request_store (>= 1.0.5)
-    guard (2.12.4)
+    guard (2.12.5)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
@@ -312,9 +312,8 @@ GEM
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-cucumber (1.5.3)
+    guard-cucumber (1.5.4)
       cucumber (>= 1.3.0)
-      guard (>= 2.0.0)
       guard-compat (~> 1.0)
       nenv (~> 0.1)
     guard-jshintrb (1.1.1)
@@ -379,7 +378,7 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.9.3)
-    listen (2.8.5)
+    listen (2.9.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -734,8 +733,8 @@ DEPENDENCIES
   foreman (= 0.62)
   fuubar (= 2.0.0)
   gon (= 5.2.3)
-  guard (= 2.12.4)
-  guard-cucumber (= 1.5.3)
+  guard (= 2.12.5)
+  guard-cucumber (= 1.5.4)
   guard-jshintrb (= 1.1.1)
   guard-rspec (= 4.5.0)
   guard-rubocop (= 1.2.0)

From 38b1f792a4d3478e22948a2cec56012953aaf7b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:13:33 +0100
Subject: [PATCH 04/17] bump mini_magick

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

diff --git a/Gemfile b/Gemfile
index 151f9188c..a4367b50a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -71,7 +71,7 @@ gem "activerecord-import", "0.7.0"
 
 gem "carrierwave", "0.10.0"
 gem "fog",         "1.28.0"
-gem "mini_magick", "4.1.0"
+gem "mini_magick", "4.2.0"
 gem "remotipart",  "1.2.1"
 
 # GUID generation
diff --git a/Gemfile.lock b/Gemfile.lock
index 6b7bebaed..8ca3f1f56 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -394,7 +394,7 @@ GEM
     messagebus_ruby_api (1.0.3)
     method_source (0.8.2)
     mime-types (2.4.3)
-    mini_magick (4.1.0)
+    mini_magick (4.2.0)
     mini_portile (0.6.2)
     minitest (5.5.1)
     mobile-fu (1.3.1)
@@ -751,7 +751,7 @@ DEPENDENCIES
   json (= 1.8.2)
   markerb (= 1.0.2)
   messagebus_ruby_api (= 1.0.3)
-  mini_magick (= 4.1.0)
+  mini_magick (= 4.2.0)
   minitest
   mobile-fu (= 1.3.1)
   mysql2 (= 0.3.18)

From a92ad87e944b91d25156bfa5b55448d1554a84f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:15:02 +0100
Subject: [PATCH 05/17] bump pry-byebug

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 8ca3f1f56..10aa6e51a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -81,10 +81,8 @@ GEM
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
     builder (3.2.2)
-    byebug (3.5.1)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-      slop (~> 3.6)
+    byebug (4.0.3)
+      columnize (= 0.9.0)
     capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -143,7 +141,6 @@ GEM
       nokogiri (~> 1.5)
       rails (>= 3, < 5)
     database_rewinder (0.5.1)
-    debugger-linecache (1.2.0)
     devise (3.4.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -454,8 +451,8 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.0.1)
-      byebug (~> 3.4)
+    pry-byebug (3.1.0)
+      byebug (~> 4.0)
       pry (~> 0.10)
     pry-debundle (0.8)
       pry

From ae93a1eef2feb9f06cefba7dd1a54dc3369e82b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:15:40 +0100
Subject: [PATCH 06/17] bump rails-assets-jasmine-ajax

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

diff --git a/Gemfile b/Gemfile
index a4367b50a..99e49541f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -271,6 +271,6 @@ group :development, :test do
   # Jasmine (client side application tests (JS))
   gem "jasmine",                   "2.2.0"
   gem "jasmine-jquery-rails",      "2.0.3"
-  gem "rails-assets-jasmine-ajax", "3.0.0", source: "https://rails-assets.org"
+  gem "rails-assets-jasmine-ajax", "3.1.0", source: "https://rails-assets.org"
   gem "sinon-rails",               "1.10.3"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 10aa6e51a..17be4f319 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -492,7 +492,7 @@ GEM
       rails-assets-jquery-ui (~> 1.10.4)
       rails-assets-jquery.slimscroll (~> 1.3.3)
     rails-assets-jasmine (2.2.1)
-    rails-assets-jasmine-ajax (3.0.0)
+    rails-assets-jasmine-ajax (3.1.0)
       rails-assets-jasmine (~> 2.0)
     rails-assets-jeresig--jquery.hotkeys (0.2.0)
       rails-assets-jquery (>= 1.4.2)
@@ -770,7 +770,7 @@ DEPENDENCIES
   rack-ssl (= 1.4.1)
   rails (= 4.2.1)
   rails-assets-diaspora_jsxc (~> 0.1.1)!
-  rails-assets-jasmine-ajax (= 3.0.0)!
+  rails-assets-jasmine-ajax (= 3.1.0)!
   rails-assets-jeresig--jquery.hotkeys (= 0.2.0)!
   rails-assets-jquery (= 1.11.1)!
   rails-assets-jquery-idletimer (= 1.0.1)!

From 03680ef71892ed687e75762c745bab3935f24057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:20:45 +0100
Subject: [PATCH 07/17] bump rails_admin

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

diff --git a/Gemfile b/Gemfile
index 99e49541f..47f35d51e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -188,7 +188,7 @@ gem "minitest"
 group :production do # we don"t install these on travis to speed up test runs
   # Administration
 
-  gem "rails_admin", "0.6.6"
+  gem "rails_admin", "0.6.7"
 
   # Analytics
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 17be4f319..9104efb0a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -535,7 +535,7 @@ GEM
     rails-timeago (2.11.0)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
-    rails_admin (0.6.6)
+    rails_admin (0.6.7)
       builder (~> 3.1)
       coffee-rails (~> 4.0)
       font-awesome-rails (>= 3.0, < 5)
@@ -787,7 +787,7 @@ DEPENDENCIES
   rails-assets-punycode (= 1.3.2)!
   rails-i18n (= 4.0.4)
   rails-timeago (= 2.11.0)
-  rails_admin (= 0.6.6)
+  rails_admin (= 0.6.7)
   rb-fsevent (= 0.9.4)
   rb-inotify (= 0.9.5)
   redcarpet (= 3.2.2)

From 65a738e60448401bb2cf86a621e548b2e4ab54c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:28:48 +0100
Subject: [PATCH 08/17] bump rspec-rails

---
 Gemfile                      |  2 +-
 Gemfile.lock                 | 41 ++++++++++++++++++------------------
 features/support/env.rb      |  4 +++-
 spec/models/reshare_spec.rb  | 22 +++++++++++++++----
 spec/spec_helper.rb          |  2 ++
 spec/support/user_methods.rb |  7 +-----
 6 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/Gemfile b/Gemfile
index 47f35d51e..7790349ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -263,7 +263,7 @@ end
 
 group :development, :test do
   # RSpec (unit tests, some integration tests)
-  gem "rspec-rails",     "3.1.0"
+  gem "rspec-rails",     "3.2.1"
 
   # Cucumber (integration tests)
   gem "cucumber-rails",     "1.4.2", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 9104efb0a..8e7bd1f1a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -571,28 +571,29 @@ GEM
     roxml (3.1.6)
       activesupport (>= 2.3.0)
       nokogiri (>= 1.3.3)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.2)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
+      rspec-support (~> 3.2.0)
     rspec-instafail (0.2.6)
       rspec
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-rails (3.2.1)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
     rubocop (0.29.1)
       astrolabe (~> 1.3)
       parser (>= 2.2.0.1, < 3.0)
@@ -795,7 +796,7 @@ DEPENDENCIES
   responders (= 2.1.0)
   roxml (= 3.1.6)
   rspec-instafail (= 0.2.6)
-  rspec-rails (= 3.1.0)
+  rspec-rails (= 3.2.1)
   rubocop (= 0.29.1)
   ruby-oembed (= 0.8.12)
   sass-rails (= 5.0.1)
diff --git a/features/support/env.rb b/features/support/env.rb
index 44b379203..5e6b81174 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -13,7 +13,9 @@ require 'capybara/session'
 #require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript
 
 # Ensure we know the appservers port
-Capybara.server_port = 9887
+Capybara.server_port = AppConfig.pod_uri.port
+Rails.application.routes.default_url_options[:host] = AppConfig.pod_uri.host
+Rails.application.routes.default_url_options[:port] = AppConfig.pod_uri.port
 
 # Use a version of Firefox defined by environment variable, if set
 Capybara.register_driver :selenium do |app|
diff --git a/spec/models/reshare_spec.rb b/spec/models/reshare_spec.rb
index 86da365db..155ac527d 100644
--- a/spec/models/reshare_spec.rb
+++ b/spec/models/reshare_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Reshare, :type => :model do
-  include Rails.application.routes.url_helpers
-
   it 'has a valid Factory' do
     expect(FactoryGirl.build(:reshare)).to be_valid
   end
@@ -207,7 +205,15 @@ describe Reshare, :type => :model do
 
           allow(@response).to receive(:body).and_return(@root_object.to_diaspora_xml)
 
-          expect(Faraday.default_connection).to receive(:get).with(URI.join(@original_author.url, short_post_path(@root_object.guid, :format => "xml"))).and_return(@response)
+          expect(Faraday.default_connection).to receive(:get).with(
+            URI.join(
+              @original_author.url,
+              Rails.application.routes.url_helpers.short_post_path(
+                @root_object.guid,
+                format: "xml"
+              )
+            )
+          ).and_return(@response)
           Reshare.from_xml(@xml)
         end
 
@@ -235,7 +241,15 @@ describe Reshare, :type => :model do
         context 'saving the post' do
           before do
             allow(@response).to receive(:body).and_return(@root_object.to_diaspora_xml)
-            allow(Faraday.default_connection).to receive(:get).with(URI.join(@reshare.root.author.url, short_post_path(@root_object.guid, :format => "xml"))).and_return(@response)
+            allow(Faraday.default_connection).to receive(:get).with(
+              URI.join(
+                @reshare.root.author.url,
+                Rails.application.routes.url_helpers.short_post_path(
+                  @root_object.guid,
+                  format: "xml"
+                )
+              )
+            ).and_return(@response)
           end
 
           it 'fetches the root post from root_guid' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index afda99679..32937f978 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -20,6 +20,8 @@ end
 
 ProcessedImage.enable_processing = false
 UnprocessedImage.enable_processing = false
+Rails.application.routes.default_url_options[:host] = AppConfig.pod_uri.host
+Rails.application.routes.default_url_options[:port] = AppConfig.pod_uri.port
 
 def set_up_friends
   [local_luke, local_leia, remote_raphael]
diff --git a/spec/support/user_methods.rb b/spec/support/user_methods.rb
index 4d897f018..85f0068f7 100644
--- a/spec/support/user_methods.rb
+++ b/spec/support/user_methods.rb
@@ -1,9 +1,4 @@
 class User
-  include Rails.application.routes.url_helpers
-  def default_url_options
-    {:host => AppConfig.pod_uri.host}
-  end
-
   alias_method :share_with_original, :share_with
 
   def share_with(*args)
@@ -22,7 +17,7 @@ class User
         self.aspects.reload
 
         add_to_streams(p, aspects)
-        dispatch_opts = {:url => post_url(p), :to => opts[:to]}
+        dispatch_opts = {url: Rails.application.routes.url_helpers.post_url(p), to: opts[:to]}
         dispatch_opts.merge!(:additional_subscribers => p.root.author) if class_name == :reshare
         dispatch_post(p, dispatch_opts)
       end

From 80957a769f9c48bb45ad843b7679e08238e93fae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:29:37 +0100
Subject: [PATCH 09/17] bump sidekiq

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

diff --git a/Gemfile b/Gemfile
index 7790349ff..29d1d7745 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha"
 
 # Background processing
 
-gem "sidekiq", "3.3.2"
+gem "sidekiq", "3.3.3"
 gem "sinatra", "1.4.5"
 
 # Scheduled processing
diff --git a/Gemfile.lock b/Gemfile.lock
index 8e7bd1f1a..29730f859 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -125,7 +125,7 @@ GEM
       sass-rails (<= 5.0.1)
       sprockets (< 2.13)
     configurate (0.2.0)
-    connection_pool (2.1.1)
+    connection_pool (2.1.3)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     cucumber (1.3.19)
@@ -619,7 +619,7 @@ GEM
     shellany (0.0.1)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    sidekiq (3.3.2)
+    sidekiq (3.3.3)
       celluloid (>= 0.16.0)
       connection_pool (>= 2.1.1)
       json
@@ -802,7 +802,7 @@ DEPENDENCIES
   sass-rails (= 5.0.1)
   selenium-webdriver (= 2.45.0)
   shoulda-matchers (= 2.8.0)
-  sidekiq (= 3.3.2)
+  sidekiq (= 3.3.3)
   sidetiq (= 0.6.3)
   simple_captcha2 (= 0.3.4)
   sinatra (= 1.4.5)

From d1c42c77ba2c3ec318ba75da44208c562b809ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:31:54 +0100
Subject: [PATCH 10/17] bump sinatra

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

diff --git a/Gemfile b/Gemfile
index 29d1d7745..3bce5127d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha"
 # Background processing
 
 gem "sidekiq", "3.3.3"
-gem "sinatra", "1.4.5"
+gem "sinatra", "1.4.6"
 
 # Scheduled processing
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 29730f859..a5a5985bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -632,10 +632,10 @@ GEM
     simple_captcha2 (0.3.4)
       rails (>= 4.1)
     simple_oauth (0.2.0)
-    sinatra (1.4.5)
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
+      tilt (>= 1.3, < 3)
     sinon-rails (1.10.3)
       railties (>= 3.1)
     slop (3.6.0)
@@ -805,7 +805,7 @@ DEPENDENCIES
   sidekiq (= 3.3.3)
   sidetiq (= 0.6.3)
   simple_captcha2 (= 0.3.4)
-  sinatra (= 1.4.5)
+  sinatra (= 1.4.6)
   sinon-rails (= 1.10.3)
   spring (= 1.3.3)
   spring-commands-cucumber (= 1.0.1)

From 3b1e93cb3091729e4a003c4a6c6c5cb0901ad0aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:33:23 +0100
Subject: [PATCH 11/17] bump test_after_commit

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

diff --git a/Gemfile b/Gemfile
index 3bce5127d..8d3ef7f52 100644
--- a/Gemfile
+++ b/Gemfile
@@ -245,7 +245,7 @@ group :test do
   gem "fixture_builder",   "0.3.6"
   gem "fuubar",            "2.0.0"
   gem "rspec-instafail",   "0.2.6", require: false
-  gem "test_after_commit", "0.4.0"
+  gem "test_after_commit", "0.4.1"
 
   # Cucumber (integration tests)
 
diff --git a/Gemfile.lock b/Gemfile.lock
index a5a5985bc..64d3cd87c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -654,7 +654,7 @@ GEM
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     systemu (2.6.4)
-    test_after_commit (0.4.0)
+    test_after_commit (0.4.1)
       activerecord (>= 3.2)
     thor (0.19.1)
     thread_safe (0.3.5)
@@ -810,7 +810,7 @@ DEPENDENCIES
   spring (= 1.3.3)
   spring-commands-cucumber (= 1.0.1)
   spring-commands-rspec (= 1.0.4)
-  test_after_commit (= 0.4.0)
+  test_after_commit (= 0.4.1)
   timecop (= 0.7.3)
   twitter (= 4.8.1)
   twitter-text (= 1.11.0)

From 699bd6e59736ae1518f1cc9bd9af014f2099b63e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:35:43 +0100
Subject: [PATCH 12/17] bump excon

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 64d3cd87c..81eb1fcd6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -182,7 +182,7 @@ GEM
     ethon (0.7.3)
       ffi (>= 1.3.0)
     eventmachine (1.0.7)
-    excon (0.44.3)
+    excon (0.44.4)
     execjs (2.4.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)

From 4f887ba5d5f4c1895ce879e5e4bf7f19f2e51df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:36:22 +0100
Subject: [PATCH 13/17] bump jwt

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 81eb1fcd6..c82ef1f3b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -370,7 +370,7 @@ GEM
       multi_json (>= 1.3)
       rake
     json (1.8.2)
-    jwt (1.3.0)
+    jwt (1.4.1)
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)

From a6b61c473cf148d720aa7b325f374920ab6bbaa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:37:03 +0100
Subject: [PATCH 14/17] bump ruby-progressbar

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

diff --git a/Gemfile.lock b/Gemfile.lock
index c82ef1f3b..e2e3993b9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -601,7 +601,7 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
     ruby-oembed (0.8.12)
-    ruby-progressbar (1.7.1)
+    ruby-progressbar (1.7.4)
     rubyzip (1.1.7)
     safe_yaml (1.0.4)
     sass (3.4.13)

From 30fcf4229e822bdf618cbe8cd5992f8474787380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:38:41 +0100
Subject: [PATCH 15/17] bump fog

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

diff --git a/Gemfile.lock b/Gemfile.lock
index e2e3993b9..600cf31cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
   specs:
-    CFPropertyList (2.3.0)
+    CFPropertyList (2.3.1)
     actionmailer (4.2.1)
       actionpack (= 4.2.1)
       actionview (= 4.2.1)
@@ -246,7 +246,7 @@ GEM
       fog-xml
     fog-json (1.0.0)
       multi_json (~> 1.0)
-    fog-profitbricks (0.0.1)
+    fog-profitbricks (0.0.2)
       fog-core
       fog-xml
       nokogiri

From 15cdb552ba50d25ef0f5ff4af5a6dba026fa9b9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:39:48 +0100
Subject: [PATCH 16/17] bump systemu

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 600cf31cc..4720a248d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -653,7 +653,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    systemu (2.6.4)
+    systemu (2.6.5)
     test_after_commit (0.4.1)
       activerecord (>= 3.2)
     thor (0.19.1)

From b58beb75fb9d2cb85d67f79cc31c8a3ecb62d2fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Wed, 25 Mar 2015 00:53:07 +0100
Subject: [PATCH 17/17] Update bundler on CI

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 3091124a6..56e74410e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ branches:
     - 'master'
     - 'develop'
 
+before_install: gem install bundler
 bundler_args: "--without development production heroku --jobs 3 --retry 3"
 
 script: "./script/ci/build.sh"