From ccaefd139d33f2f0bf4d097131bcf91960bee956 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Thu, 6 Feb 2020 11:25:18 +0100 Subject: Add environment variable to specify extra data hosts Fixes #1276 --- config/initializers/content_security_policy.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config/initializers') diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 810aa2880..269a7d1c9 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -23,6 +23,8 @@ if Rails.env.production? data_hosts << "https://#{url.host}" end + data_hosts.concat(ENV['EXTRA_DATA_HOSTS'].split('|')) if ENV['EXTRA_DATA_HOSTS'] + data_hosts.uniq! Rails.application.config.content_security_policy do |p| -- cgit From 2edf317efc26f11632ea46bd9168f8c997be7180 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 10 Feb 2020 19:03:14 +0100 Subject: Fix ActiveRecord::Migration.check_pending! failing because of duplicate migrations --- config/initializers/0_duplicate_migrations.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'config/initializers') diff --git a/config/initializers/0_duplicate_migrations.rb b/config/initializers/0_duplicate_migrations.rb index 4ab806587..194aff70c 100644 --- a/config/initializers/0_duplicate_migrations.rb +++ b/config/initializers/0_duplicate_migrations.rb @@ -37,4 +37,16 @@ module ActiveRecord super(direction, migrations, target_version) end end + + class MigrationContext + def needs_migration? + # A set of duplicated migrations is considered migrated if at least one of + # them is migrated. + migrated = get_all_versions + migrations.group_by(&:name).each do |name, duplicates| + return true unless duplicates.any? { |m| migrated.include?(m.version.to_i) } + end + return false + end + end end -- cgit