Download as
Browse Code »

Commit 2e2cf49ff65c84d8bfd56f3ac621f1c4f7b9c046

Authored by Joenio Costa
Committed by Daniela Feitosa
1 parent 41aa926a
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Adding Vimeo as trusted site for iframe

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @2e2cf49
@@ -220,7 +220,7 @@ class Environment < ActiveRecord::Base @@ -220,7 +220,7 @@ class Environment < ActiveRecord::Base
220 settings_items :currency_separator, :type => String, :default => '.' 220 settings_items :currency_separator, :type => String, :default => '.'
221 settings_items :currency_delimiter, :type => String, :default => ',' 221 settings_items :currency_delimiter, :type => String, :default => ','
222 222
223 - settings_items :trusted_sites_for_iframe, :type => Array, :default => ['itheora.org', 'tv.softwarelivre.org', 'stream.softwarelivre.org', 'www.youtube.com'] 223 + settings_items :trusted_sites_for_iframe, :type => Array, :default => ['itheora.org', 'tv.softwarelivre.org', 'stream.softwarelivre.org', 'www.youtube.com', 'player.vimeo.com']
224 224
225 settings_items :enabled_plugins, :type => Array, :default => [] 225 settings_items :enabled_plugins, :type => Array, :default => []
226 226
test/unit/environment_test.rb
  Diff comments   View file @2e2cf49
@@ -1070,7 +1070,7 @@ class EnvironmentTest < Test::Unit::TestCase @@ -1070,7 +1070,7 @@ class EnvironmentTest < Test::Unit::TestCase
1070 end 1070 end
1071 1071
1072 should 'have a list of trusted sites by default' do 1072 should 'have a list of trusted sites by default' do
1073 - assert_equal ['itheora.org', 'tv.softwarelivre.org', 'stream.softwarelivre.org', 'www.youtube.com'], Environment.new.trusted_sites_for_iframe 1073 + assert_equal ['itheora.org', 'tv.softwarelivre.org', 'stream.softwarelivre.org', 'www.youtube.com', 'player.vimeo.com'], Environment.new.trusted_sites_for_iframe
1074 end 1074 end
1075 1075
1076 should 'have a list of trusted sites' do 1076 should 'have a list of trusted sites' do