3 files changed, 5 insertions, 12 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 1ee90e88f2..a952ff7fb0 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -41,6 +41,11 @@ module <%= app_const_base %>
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
+    config.action_dispatch.default_headers = {
+        'X-Frame-Options' => 'SAMEORIGIN',
+        'X-XSS-Protection' => '1; mode=block'
+    }
+
     # Use SQL instead of Active Record's schema dumper when creating the database.
     # This is necessary if your schema can't be completely dumped by the schema dumper,
     # like if you have constraints or database-specific column types.
@@ -51,11 +56,6 @@ module <%= app_const_base %>
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
     <%= comment_if :skip_active_record %>config.active_record.whitelist_attributes = true
-
-    # Specifies whether or not has_many or has_one association option :dependent => :restrict raises
-    # an exception. If set to true, then an ActiveRecord::DeleteRestrictionError exception would be
-    # raised. If set to false, then an error will be added on the model instead.
-    <%= comment_if :skip_active_record %>config.active_record.dependent_restrict_raises = false
 <% unless options.skip_sprockets? -%>
 
     # Enable the asset pipeline.
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 907065f75c..c294bfb238 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -213,7 +213,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_no_file "config/database.yml"
     assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/
     assert_file "config/application.rb", /#\s+config\.active_record\.whitelist_attributes = true/
-    assert_file "config/application.rb", /#\s+config\.active_record\.dependent_restrict_raises = false/
     assert_file "test/test_helper.rb" do |helper_content|
       assert_no_match(/fixtures :all/, helper_content)
     end
@@ -367,11 +366,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file "config/application.rb", /config\.active_record\.whitelist_attributes = true/
   end
 
-  def test_active_record_dependent_restrict_raises_is_present_application_config
-    run_generator
-    assert_file "config/application.rb", /config\.active_record\.dependent_restrict_raises = false/
-  end
-
   def test_pretend_option
     output = run_generator [File.join(destination_root, "myapp"), "--pretend"]
     assert_no_match(/run  bundle install/, output)
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 6071cd3f39..8f04692aef 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -253,7 +253,6 @@ module TestHelpers
                     :activerecord] - arr
       if to_remove.include? :activerecord
         remove_from_config "config.active_record.whitelist_attributes = true"
-        remove_from_config "config.active_record.dependent_restrict_raises = false"
       end
       $:.reject! {|path| path =~ %r'/(#{to_remove.join('|')})/' }
     end