nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5922 from diaspora/update_gems

Browse source 
Update gems
This commit is contained in:
Jonne Haß 2015-05-04 15:14:34 +02:00
commit a30e34bfdb
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -32,7 +32,7 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha"
# Background processing # Background processing
gem "sidekiq", "3.3.3" gem "sidekiq", "3.3.4"
gem "sinatra", "1.4.6" gem "sinatra", "1.4.6"
# Scheduled processing # Scheduled processing
@ -129,7 +129,7 @@ gem "nokogiri", "1.6.6.2"
gem "redcarpet", "3.2.3" gem "redcarpet", "3.2.3"
gem "twitter-text", "1.11.0" gem "twitter-text", "1.11.0"
gem "roxml", "3.1.6" gem "roxml", "3.1.6"
gem "ruby-oembed", "0.8.12" gem "ruby-oembed", "0.8.14"
gem "open_graph_reader", "0.5.0" gem "open_graph_reader", "0.5.0"
# Services # Services

12
Gemfile.lock
View file

@ -125,7 +125,7 @@ GEM
sass-rails (<= 5.0.1) sass-rails (<= 5.0.1)
sprockets (< 2.13) sprockets (< 2.13)
configurate (0.2.0) configurate (0.2.0)
connection_pool (2.1.3) connection_pool (2.2.0)
crack (0.4.2) crack (0.4.2)
safe_yaml (~> 1.0.0) safe_yaml (~> 1.0.0)
cucumber (1.3.19) cucumber (1.3.19)
@ -565,7 +565,7 @@ GEM
ffi (>= 0.5.0) ffi (>= 0.5.0)
redcarpet (3.2.3) redcarpet (3.2.3)
redis (3.2.1) redis (3.2.1)
redis-namespace (1.5.1) redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4) redis (~> 3.0, >= 3.0.4)
remotipart (1.2.1) remotipart (1.2.1)
request_store (1.1.0) request_store (1.1.0)
@ -603,7 +603,7 @@ GEM
powerpack (~> 0.1) powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0) rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4) ruby-progressbar (~> 1.4)
ruby-oembed (0.8.12) ruby-oembed (0.8.14)
ruby-progressbar (1.7.5) ruby-progressbar (1.7.5)
rubyzip (1.1.7) rubyzip (1.1.7)
safe_yaml (1.0.4) safe_yaml (1.0.4)
@ -622,7 +622,7 @@ GEM
shellany (0.0.1) shellany (0.0.1)
shoulda-matchers (2.8.0) shoulda-matchers (2.8.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
sidekiq (3.3.3) sidekiq (3.3.4)
celluloid (>= 0.16.0) celluloid (>= 0.16.0)
connection_pool (>= 2.1.1) connection_pool (>= 2.1.1)
json json
@ -805,11 +805,11 @@ DEPENDENCIES
rspec-instafail (= 0.2.6) rspec-instafail (= 0.2.6)
rspec-rails (= 3.2.1) rspec-rails (= 3.2.1)
rubocop (= 0.29.1) rubocop (= 0.29.1)
ruby-oembed (= 0.8.12) ruby-oembed (= 0.8.14)
sass-rails (= 5.0.1) sass-rails (= 5.0.1)
selenium-webdriver (= 2.45.0) selenium-webdriver (= 2.45.0)
shoulda-matchers (= 2.8.0) shoulda-matchers (= 2.8.0)
sidekiq (= 3.3.3) sidekiq (= 3.3.4)
sidetiq (= 0.6.3) sidetiq (= 0.6.3)
simple_captcha2 (= 0.3.4) simple_captcha2 (= 0.3.4)
sinatra (= 1.4.6) sinatra (= 1.4.6)

7
spec/workers/gather_o_embed_data_spec.rb
View file

@ -16,9 +16,10 @@ describe Workers::GatherOEmbedData do
"url" => "https://farm4.static.flickr.com/3123/2341623661_7c99f48bbf_m.jpg" "url" => "https://farm4.static.flickr.com/3123/2341623661_7c99f48bbf_m.jpg"
} }
@flickr_oembed_url = 'http://www.flickr.com/services/oembed/' @flickr_oembed_url = "https://www.flickr.com/services/oembed/"
@flickr_photo_url = 'http://www.flickr.com/photos/bees/2341623661' @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_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' @no_oembed_url = 'http://www.we-do-not-support-oembed.com/index.html'