From dd45b79a9840d24e43342ebda92ff875bc8f8b0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Mon, 2 Mar 2015 02:34:51 +0100
Subject: [PATCH] Drop Youtube oembed HTTPS hack
upstream ships it now that way
---
config/initializers/oembed.rb | 2 --
spec/controllers/jasmine_fixtures/aspects_spec.rb | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/config/initializers/oembed.rb b/config/initializers/oembed.rb
index bf0fc20925..e8334cdad0 100644
--- a/config/initializers/oembed.rb
+++ b/config/initializers/oembed.rb
@@ -15,8 +15,6 @@ oembed_provider_list = [
OEmbed::Providers::Flickr
]
-OEmbed::Providers::Youtube.endpoint += "?scheme=https"
-
oembed_providers = YAML.load_file(Rails.root.join("config", "oembed_providers.yml"))
oembed_providers.each do |provider_name, provider|
diff --git a/spec/controllers/jasmine_fixtures/aspects_spec.rb b/spec/controllers/jasmine_fixtures/aspects_spec.rb
index 315d460574..bdbf026bae 100644
--- a/spec/controllers/jasmine_fixtures/aspects_spec.rb
+++ b/spec/controllers/jasmine_fixtures/aspects_spec.rb
@@ -68,7 +68,7 @@ describe StreamsController, :type => :controller do
it "generates a jasmine fixture with a post containing a video", :fixture => true do
stub_request(
: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(
:headers => {'Accept'=>'*/*'}
).to_return(
--
GitLab