diff --git a/actionmailbox/test/dummy/config/initializers/permissions_policy.rb b/actionmailbox/test/dummy/config/initializers/permissions_policy.rb deleted file mode 100644 index 7db3b9577e..0000000000 --- a/actionmailbox/test/dummy/config/initializers/permissions_policy.rb +++ /dev/null @@ -1,13 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Define an application-wide HTTP permissions policy. For further -# information see: https://developers.google.com/web/updates/2018/06/feature-policy - -# Rails.application.config.permissions_policy do |policy| -# policy.camera :none -# policy.gyroscope :none -# policy.microphone :none -# policy.usb :none -# policy.fullscreen :self -# policy.payment :self, "https://secure.example.com" -# end diff --git a/actiontext/test/dummy/config/initializers/permissions_policy.rb b/actiontext/test/dummy/config/initializers/permissions_policy.rb deleted file mode 100644 index 7db3b9577e..0000000000 --- a/actiontext/test/dummy/config/initializers/permissions_policy.rb +++ /dev/null @@ -1,13 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Define an application-wide HTTP permissions policy. For further -# information see: https://developers.google.com/web/updates/2018/06/feature-policy - -# Rails.application.config.permissions_policy do |policy| -# policy.camera :none -# policy.gyroscope :none -# policy.microphone :none -# policy.usb :none -# policy.fullscreen :self -# policy.payment :self, "https://secure.example.com" -# end diff --git a/activestorage/test/dummy/config/initializers/permissions_policy.rb b/activestorage/test/dummy/config/initializers/permissions_policy.rb deleted file mode 100644 index 7db3b9577e..0000000000 --- a/activestorage/test/dummy/config/initializers/permissions_policy.rb +++ /dev/null @@ -1,13 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Define an application-wide HTTP permissions policy. For further -# information see: https://developers.google.com/web/updates/2018/06/feature-policy - -# Rails.application.config.permissions_policy do |policy| -# policy.camera :none -# policy.gyroscope :none -# policy.microphone :none -# policy.usb :none -# policy.fullscreen :self -# policy.payment :self, "https://secure.example.com" -# end diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 405a8ef986..389143b47c 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -145,7 +145,6 @@ def config_when_updating asset_manifest_exist = File.exist?("app/assets/config/manifest.js") asset_app_stylesheet_exist = File.exist?("app/assets/stylesheets/application.css") csp_config_exist = File.exist?("config/initializers/content_security_policy.rb") - permissions_policy_config_exist = File.exist?("config/initializers/permissions_policy.rb") @config_target_version = Rails.application.config.loaded_config_version || "5.0" @@ -179,10 +178,6 @@ def config_when_updating unless csp_config_exist remove_file "config/initializers/content_security_policy.rb" end - - unless permissions_policy_config_exist - remove_file "config/initializers/permissions_policy.rb" - end end end @@ -559,7 +554,6 @@ def delete_action_cable_files_skipping_action_cable def delete_non_api_initializers_if_api_option if options[:api] remove_file "config/initializers/content_security_policy.rb" - remove_file "config/initializers/permissions_policy.rb" end end diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/permissions_policy.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/permissions_policy.rb.tt deleted file mode 100644 index 7db3b9577e..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/permissions_policy.rb.tt +++ /dev/null @@ -1,13 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Define an application-wide HTTP permissions policy. For further -# information see: https://developers.google.com/web/updates/2018/06/feature-policy - -# Rails.application.config.permissions_policy do |policy| -# policy.camera :none -# policy.gyroscope :none -# policy.microphone :none -# policy.usb :none -# policy.fullscreen :self -# policy.payment :self, "https://secure.example.com" -# end diff --git a/railties/test/generators/api_app_generator_test.rb b/railties/test/generators/api_app_generator_test.rb index 58491515dd..92aa4ea31e 100644 --- a/railties/test/generators/api_app_generator_test.rb +++ b/railties/test/generators/api_app_generator_test.rb @@ -115,7 +115,6 @@ def test_app_update_does_not_generate_unnecessary_config_files assert_no_file "config/initializers/assets.rb" assert_no_file "config/initializers/content_security_policy.rb" - assert_no_file "config/initializers/permissions_policy.rb" end def test_app_update_does_not_generate_unnecessary_bin_files @@ -187,7 +186,6 @@ def skipped_files bin/yarn config/initializers/assets.rb config/initializers/content_security_policy.rb - config/initializers/permissions_policy.rb lib/assets test/helpers public/404.html diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index b714543528..721e884553 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -53,7 +53,6 @@ config/initializers/content_security_policy.rb config/initializers/filter_parameter_logging.rb config/initializers/inflections.rb - config/initializers/permissions_policy.rb config/locales/en.yml config/master.key config/puma.rb diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index 8046c0bb2f..aff7d11fa2 100644 --- a/railties/test/generators/plugin_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -56,7 +56,6 @@ test/dummy/config/initializers/content_security_policy.rb test/dummy/config/initializers/filter_parameter_logging.rb test/dummy/config/initializers/inflections.rb - test/dummy/config/initializers/permissions_policy.rb test/dummy/config/locales/en.yml test/dummy/config/puma.rb test/dummy/config/routes.rb