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

Drop Youtube oembed HTTPS hack

Browse source 
upstream ships it now that way
This commit is contained in:
Jonne Haß 2015-03-02 02:34:51 +01:00
parent c9729d66d6
commit dd45b79a98
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/initializers/oembed.rb
View file

@ -15,8 +15,6 @@ oembed_provider_list = [
OEmbed::Providers::Flickr OEmbed::Providers::Flickr
] ]
OEmbed::Providers::Youtube.endpoint += "?scheme=https"
oembed_providers = YAML.load_file(Rails.root.join("config", "oembed_providers.yml")) oembed_providers = YAML.load_file(Rails.root.join("config", "oembed_providers.yml"))
oembed_providers.each do |provider_name, provider| oembed_providers.each do |provider_name, provider|

2
spec/controllers/jasmine_fixtures/aspects_spec.rb
View file

@ -68,7 +68,7 @@ describe StreamsController, :type => :controller do
it "generates a jasmine fixture with a post containing a video", :fixture => true do it "generates a jasmine fixture with a post containing a video", :fixture => true do
stub_request( stub_request(
:get, :get,
"http://www.youtube.com/oembed?format=json&frame=1&iframe=1&maxheight=420&maxwidth=420&scheme=https?scheme=https&url=http://www.youtube.com/watch?v=UYrkQL1bX4A" "http://www.youtube.com/oembed?format=json&frame=1&iframe=1&maxheight=420&maxwidth=420&scheme=https&url=http://www.youtube.com/watch?v=UYrkQL1bX4A"
).with( ).with(
:headers => {'Accept'=>'*/*'} :headers => {'Accept'=>'*/*'}
).to_return( ).to_return(