From 87b3e226d65ac1ed371620bfdcd2f950c87cfece Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Sun, 2 Jul 2017 02:15:17 +0930
Subject: Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"

This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing
changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
---
 actionview/test/fixtures/actionpack/layouts/builder.builder              | 1 -
 actionview/test/fixtures/actionpack/test/_hello.builder                  | 1 -
 actionview/test/fixtures/actionpack/test/formatted_xml_erb.builder       | 1 -
 actionview/test/fixtures/actionpack/test/hello.builder                   | 1 -
 actionview/test/fixtures/actionpack/test/hello_world_container.builder   | 1 -
 actionview/test/fixtures/actionpack/test/hello_world_from_rxml.builder   | 1 -
 actionview/test/fixtures/actionpack/test/hello_xml_world.builder         | 1 -
 .../test/fixtures/actionpack/test/implicit_content_type.atom.builder     | 1 -
 .../test/fixtures/actionpack/test/non_erb_block_content_for.builder      | 1 -
 9 files changed, 9 deletions(-)

(limited to 'actionview/test/fixtures/actionpack')

diff --git a/actionview/test/fixtures/actionpack/layouts/builder.builder b/actionview/test/fixtures/actionpack/layouts/builder.builder
index 0f34d03a4c..c55488edd0 100644
--- a/actionview/test/fixtures/actionpack/layouts/builder.builder
+++ b/actionview/test/fixtures/actionpack/layouts/builder.builder
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 xml.wrapper do
   xml << yield
 end
diff --git a/actionview/test/fixtures/actionpack/test/_hello.builder b/actionview/test/fixtures/actionpack/test/_hello.builder
index a767060f3c..fc72df16d0 100644
--- a/actionview/test/fixtures/actionpack/test/_hello.builder
+++ b/actionview/test/fixtures/actionpack/test/_hello.builder
@@ -1,2 +1 @@
-# frozen_string_literal: true
 xm.hello
diff --git a/actionview/test/fixtures/actionpack/test/formatted_xml_erb.builder b/actionview/test/fixtures/actionpack/test/formatted_xml_erb.builder
index 568a2ddefe..f98aaa34a5 100644
--- a/actionview/test/fixtures/actionpack/test/formatted_xml_erb.builder
+++ b/actionview/test/fixtures/actionpack/test/formatted_xml_erb.builder
@@ -1,2 +1 @@
-# frozen_string_literal: true
 xml.test "failed"
diff --git a/actionview/test/fixtures/actionpack/test/hello.builder b/actionview/test/fixtures/actionpack/test/hello.builder
index 205ad8722f..b8ab17ad5b 100644
--- a/actionview/test/fixtures/actionpack/test/hello.builder
+++ b/actionview/test/fixtures/actionpack/test/hello.builder
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 xml.html do
   xml.p "Hello #{@name}"
   xml << render(file: "test/greeting")
diff --git a/actionview/test/fixtures/actionpack/test/hello_world_container.builder b/actionview/test/fixtures/actionpack/test/hello_world_container.builder
index f0291694ee..24032ab5e0 100644
--- a/actionview/test/fixtures/actionpack/test/hello_world_container.builder
+++ b/actionview/test/fixtures/actionpack/test/hello_world_container.builder
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 xml.test do
   render partial: "hello", locals: { xm: xml }
 end
diff --git a/actionview/test/fixtures/actionpack/test/hello_world_from_rxml.builder b/actionview/test/fixtures/actionpack/test/hello_world_from_rxml.builder
index 2a87fd1a3d..619a97ba96 100644
--- a/actionview/test/fixtures/actionpack/test/hello_world_from_rxml.builder
+++ b/actionview/test/fixtures/actionpack/test/hello_world_from_rxml.builder
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 xml.html do
   xml.p "Hello"
 end
diff --git a/actionview/test/fixtures/actionpack/test/hello_xml_world.builder b/actionview/test/fixtures/actionpack/test/hello_xml_world.builder
index c496fb4160..d16bb6b5cb 100644
--- a/actionview/test/fixtures/actionpack/test/hello_xml_world.builder
+++ b/actionview/test/fixtures/actionpack/test/hello_xml_world.builder
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 xml.html do
   xml.head do
     xml.title "Hello World"
diff --git a/actionview/test/fixtures/actionpack/test/implicit_content_type.atom.builder b/actionview/test/fixtures/actionpack/test/implicit_content_type.atom.builder
index bcb3c79f0b..2fcb32d247 100644
--- a/actionview/test/fixtures/actionpack/test/implicit_content_type.atom.builder
+++ b/actionview/test/fixtures/actionpack/test/implicit_content_type.atom.builder
@@ -1,3 +1,2 @@
-# frozen_string_literal: true
 xml.atom do
 end
diff --git a/actionview/test/fixtures/actionpack/test/non_erb_block_content_for.builder b/actionview/test/fixtures/actionpack/test/non_erb_block_content_for.builder
index 4db7d66d90..cd65da751b 100644
--- a/actionview/test/fixtures/actionpack/test/non_erb_block_content_for.builder
+++ b/actionview/test/fixtures/actionpack/test/non_erb_block_content_for.builder
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 content_for :title do
   "Putting stuff in the title!"
 end
-- 
cgit v1.2.3