Merge conflict

otwcode · Aug 30, 2016 · c987f22 · c987f22
2 parents 58d604c + effad43
commit c987f22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/config/initializers/gem-plugin_config/sanitizer_config.rb b/config/initializers/gem-plugin_config/sanitizer_config.rb
@@ -92,6 +92,8 @@ module Transformers
         then "ning"
       when /^dailymotion\.com\//
         then "dailymotion"
+      when /^viddertube\.com\//
+        then "viddertube"
       when /^metacafe\.com\//
         then "metacafe"
       when /^vidders\.net\//

diff --git a/spec/lib/html_cleaner_spec.rb b/spec/lib/html_cleaner_spec.rb
@@ -205,8 +205,8 @@
         expect(result.to_s.squish).to eq('<p></p><div dir="rtl"> <p>This is RTL content</p> </div>')
       end
 
-      %w{youtube.com youtube-nocookie.com vimeo.com player.vimeo.com blip.tv static.ning.com ning.com dailymotion.com
-         viddler.com metacafe.com vidders.net criticalcommons.org google.com archiveofourown.org podfic.com archive.org
+      %w{youtube.com youtube-nocookie.com vimeo.com player.vimeo.com static.ning.com ning.com dailymotion.com
+         metacafe.com criticalcommons.org google.com archiveofourown.org podfic.com archive.org
          embed.spotify.com spotify.com 8tracks.com w.soundcloud.com soundcloud.com viddertube.com}.each do |source|
 
         it "should allow embeds from #{source}" do