Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonne Haß <me@jhass.eu>2015-05-04 14:05:22 +0300
committerJonne Haß <me@jhass.eu>2015-05-04 15:22:57 +0300
commitbb141280525815dc8d214dc7ac6af572211187d4 (patch)
treeae57a72ee425da5a152d56d22419c8b13286fee2
parent63be9d57b601ab5ea37876ac6b7e5e97097b41fd (diff)
bump ruby-oembed
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
-rw-r--r--spec/workers/gather_o_embed_data_spec.rb7
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'