From bb141280525815dc8d214dc7ac6af572211187d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Mon, 4 May 2015 13:05:22 +0200
Subject: [PATCH 1/2] bump ruby-oembed

---
 Gemfile                                  | 2 +-
 Gemfile.lock                             | 4 ++--
 spec/workers/gather_o_embed_data_spec.rb | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 56eaad7fb..6ffe68ae2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -129,7 +129,7 @@ gem "nokogiri",          "1.6.6.2"
 gem "redcarpet",         "3.2.3"
 gem "twitter-text",      "1.11.0"
 gem "roxml",             "3.1.6"
-gem "ruby-oembed",       "0.8.12"
+gem "ruby-oembed",       "0.8.14"
 gem "open_graph_reader", "0.5.0"
 
 # Services
diff --git a/Gemfile.lock b/Gemfile.lock
index 81c12beb8..e4eb2d8a4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -603,7 +603,7 @@ GEM
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-oembed (0.8.12)
+    ruby-oembed (0.8.14)
     ruby-progressbar (1.7.5)
     rubyzip (1.1.7)
     safe_yaml (1.0.4)
@@ -805,7 +805,7 @@ DEPENDENCIES
   rspec-instafail (= 0.2.6)
   rspec-rails (= 3.2.1)
   rubocop (= 0.29.1)
-  ruby-oembed (= 0.8.12)
+  ruby-oembed (= 0.8.14)
   sass-rails (= 5.0.1)
   selenium-webdriver (= 2.45.0)
   shoulda-matchers (= 2.8.0)
diff --git a/spec/workers/gather_o_embed_data_spec.rb b/spec/workers/gather_o_embed_data_spec.rb
index 97177d7de..ad01e4a30 100644
--- a/spec/workers/gather_o_embed_data_spec.rb
+++ b/spec/workers/gather_o_embed_data_spec.rb
@@ -16,9 +16,10 @@ describe Workers::GatherOEmbedData do
       "url" => "https://farm4.static.flickr.com/3123/2341623661_7c99f48bbf_m.jpg"
     }
 
-    @flickr_oembed_url = 'http://www.flickr.com/services/oembed/'
-    @flickr_photo_url = 'http://www.flickr.com/photos/bees/2341623661'
-    @flickr_oembed_get_request = @flickr_oembed_url+"?format=json&frame=1&iframe=1&maxheight=420&maxwidth=420&url="+@flickr_photo_url
+    @flickr_oembed_url = "https://www.flickr.com/services/oembed/"
+    @flickr_photo_url = "http://www.flickr.com/photos/bees/2341623661"
+    @flickr_oembed_get_request = "#{@flickr_oembed_url}" \
+      "?format=json&frame=1&iframe=1&maxheight=420&maxwidth=420&url=#{@flickr_photo_url}"
 
     @no_oembed_url = 'http://www.we-do-not-support-oembed.com/index.html'
 

From 28ee47d6c94b0872b1a1bc816f405747df8bceec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Mon, 4 May 2015 13:19:52 +0200
Subject: [PATCH 2/2] bump sidekiq

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

diff --git a/Gemfile b/Gemfile
index 6ffe68ae2..d7fa979d5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha"
 
 # Background processing
 
-gem "sidekiq", "3.3.3"
+gem "sidekiq", "3.3.4"
 gem "sinatra", "1.4.6"
 
 # Scheduled processing
diff --git a/Gemfile.lock b/Gemfile.lock
index e4eb2d8a4..d1a9a1b7c 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.3)
+    connection_pool (2.2.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     cucumber (1.3.19)
@@ -565,7 +565,7 @@ GEM
       ffi (>= 0.5.0)
     redcarpet (3.2.3)
     redis (3.2.1)
-    redis-namespace (1.5.1)
+    redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
     remotipart (1.2.1)
     request_store (1.1.0)
@@ -622,7 +622,7 @@ GEM
     shellany (0.0.1)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    sidekiq (3.3.3)
+    sidekiq (3.3.4)
       celluloid (>= 0.16.0)
       connection_pool (>= 2.1.1)
       json
@@ -809,7 +809,7 @@ DEPENDENCIES
   sass-rails (= 5.0.1)
   selenium-webdriver (= 2.45.0)
   shoulda-matchers (= 2.8.0)
-  sidekiq (= 3.3.3)
+  sidekiq (= 3.3.4)
   sidetiq (= 0.6.3)
   simple_captcha2 (= 0.3.4)
   sinatra (= 1.4.6)