From 2e2cf49ff65c84d8bfd56f3ac621f1c4f7b9c046 Mon Sep 17 00:00:00 2001 From: Joenio Costa Date: Thu, 5 May 2011 18:33:52 -0300 Subject: [PATCH] Adding Vimeo as trusted site for iframe --- app/models/environment.rb | 2 +- test/unit/environment_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/environment.rb b/app/models/environment.rb index 14fc713..61a623f 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -220,7 +220,7 @@ class Environment < ActiveRecord::Base settings_items :currency_separator, :type => String, :default => '.' settings_items :currency_delimiter, :type => String, :default => ',' - settings_items :trusted_sites_for_iframe, :type => Array, :default => ['itheora.org', 'tv.softwarelivre.org', 'stream.softwarelivre.org', 'www.youtube.com'] + settings_items :trusted_sites_for_iframe, :type => Array, :default => ['itheora.org', 'tv.softwarelivre.org', 'stream.softwarelivre.org', 'www.youtube.com', 'player.vimeo.com'] settings_items :enabled_plugins, :type => Array, :default => [] diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb index 83f1d96..6545df3 100644 --- a/test/unit/environment_test.rb +++ b/test/unit/environment_test.rb @@ -1070,7 +1070,7 @@ class EnvironmentTest < Test::Unit::TestCase end should 'have a list of trusted sites by default' do - assert_equal ['itheora.org', 'tv.softwarelivre.org', 'stream.softwarelivre.org', 'www.youtube.com'], Environment.new.trusted_sites_for_iframe + assert_equal ['itheora.org', 'tv.softwarelivre.org', 'stream.softwarelivre.org', 'www.youtube.com', 'player.vimeo.com'], Environment.new.trusted_sites_for_iframe end should 'have a list of trusted sites' do -- libgit2 0.21.2