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.
---
 activesupport/lib/active_support/core_ext/string/access.rb           | 1 -
 activesupport/lib/active_support/core_ext/string/behavior.rb         | 1 -
 activesupport/lib/active_support/core_ext/string/conversions.rb      | 1 -
 activesupport/lib/active_support/core_ext/string/exclude.rb          | 1 -
 activesupport/lib/active_support/core_ext/string/filters.rb          | 1 -
 activesupport/lib/active_support/core_ext/string/indent.rb           | 1 -
 activesupport/lib/active_support/core_ext/string/inflections.rb      | 1 -
 activesupport/lib/active_support/core_ext/string/inquiry.rb          | 1 -
 activesupport/lib/active_support/core_ext/string/multibyte.rb        | 1 -
 activesupport/lib/active_support/core_ext/string/output_safety.rb    | 1 -
 activesupport/lib/active_support/core_ext/string/starts_ends_with.rb | 1 -
 activesupport/lib/active_support/core_ext/string/strip.rb            | 1 -
 activesupport/lib/active_support/core_ext/string/zones.rb            | 1 -
 13 files changed, 13 deletions(-)

(limited to 'activesupport/lib/active_support/core_ext/string')

diff --git a/activesupport/lib/active_support/core_ext/string/access.rb b/activesupport/lib/active_support/core_ext/string/access.rb
index 11f4bf8052..6133826f37 100644
--- a/activesupport/lib/active_support/core_ext/string/access.rb
+++ b/activesupport/lib/active_support/core_ext/string/access.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class String
   # If you pass a single integer, returns a substring of one character at that
   # position. The first character of the string is at position 0, the next at
diff --git a/activesupport/lib/active_support/core_ext/string/behavior.rb b/activesupport/lib/active_support/core_ext/string/behavior.rb
index e63888991d..710f1f4670 100644
--- a/activesupport/lib/active_support/core_ext/string/behavior.rb
+++ b/activesupport/lib/active_support/core_ext/string/behavior.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class String
   # Enables more predictable duck-typing on String-like classes. See <tt>Object#acts_like?</tt>.
   def acts_like_string?
diff --git a/activesupport/lib/active_support/core_ext/string/conversions.rb b/activesupport/lib/active_support/core_ext/string/conversions.rb
index 79668312c5..221b4969cc 100644
--- a/activesupport/lib/active_support/core_ext/string/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/string/conversions.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "date"
 require "active_support/core_ext/time/calculations"
 
diff --git a/activesupport/lib/active_support/core_ext/string/exclude.rb b/activesupport/lib/active_support/core_ext/string/exclude.rb
index 2893a6eeed..0ac684f6ee 100644
--- a/activesupport/lib/active_support/core_ext/string/exclude.rb
+++ b/activesupport/lib/active_support/core_ext/string/exclude.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class String
   # The inverse of <tt>String#include?</tt>. Returns true if the string
   # does not include the other string.
diff --git a/activesupport/lib/active_support/core_ext/string/filters.rb b/activesupport/lib/active_support/core_ext/string/filters.rb
index e05cf024f6..a9ec2eb842 100644
--- a/activesupport/lib/active_support/core_ext/string/filters.rb
+++ b/activesupport/lib/active_support/core_ext/string/filters.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class String
   # Returns the string, first removing all whitespace on both ends of
   # the string, and then changing remaining consecutive whitespace
diff --git a/activesupport/lib/active_support/core_ext/string/indent.rb b/activesupport/lib/active_support/core_ext/string/indent.rb
index a38198a8e6..d7b58301d3 100644
--- a/activesupport/lib/active_support/core_ext/string/indent.rb
+++ b/activesupport/lib/active_support/core_ext/string/indent.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class String
   # Same as +indent+, except it indents the receiver in-place.
   #
diff --git a/activesupport/lib/active_support/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb
index 63bb52b2da..b27cfe53f4 100644
--- a/activesupport/lib/active_support/core_ext/string/inflections.rb
+++ b/activesupport/lib/active_support/core_ext/string/inflections.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "active_support/inflector/methods"
 require "active_support/inflector/transliterate"
 
diff --git a/activesupport/lib/active_support/core_ext/string/inquiry.rb b/activesupport/lib/active_support/core_ext/string/inquiry.rb
index 874efc6ae3..c95d83beae 100644
--- a/activesupport/lib/active_support/core_ext/string/inquiry.rb
+++ b/activesupport/lib/active_support/core_ext/string/inquiry.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "active_support/string_inquirer"
 
 class String
diff --git a/activesupport/lib/active_support/core_ext/string/multibyte.rb b/activesupport/lib/active_support/core_ext/string/multibyte.rb
index aee0bb4bf3..1c73182259 100644
--- a/activesupport/lib/active_support/core_ext/string/multibyte.rb
+++ b/activesupport/lib/active_support/core_ext/string/multibyte.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "active_support/multibyte"
 
 class String
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index c26f1edc88..94ce3f6a61 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "erb"
 require "active_support/core_ext/kernel/singleton_class"
 require "active_support/multibyte/unicode"
diff --git a/activesupport/lib/active_support/core_ext/string/starts_ends_with.rb b/activesupport/lib/active_support/core_ext/string/starts_ends_with.rb
index f072fbf7d7..641acf62d0 100644
--- a/activesupport/lib/active_support/core_ext/string/starts_ends_with.rb
+++ b/activesupport/lib/active_support/core_ext/string/starts_ends_with.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class String
   alias_method :starts_with?, :start_with?
   alias_method :ends_with?, :end_with?
diff --git a/activesupport/lib/active_support/core_ext/string/strip.rb b/activesupport/lib/active_support/core_ext/string/strip.rb
index 979b6bd767..bb62e6c0ba 100644
--- a/activesupport/lib/active_support/core_ext/string/strip.rb
+++ b/activesupport/lib/active_support/core_ext/string/strip.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class String
   # Strips indentation in heredocs.
   #
diff --git a/activesupport/lib/active_support/core_ext/string/zones.rb b/activesupport/lib/active_support/core_ext/string/zones.rb
index a327bdc782..de5a28e4f7 100644
--- a/activesupport/lib/active_support/core_ext/string/zones.rb
+++ b/activesupport/lib/active_support/core_ext/string/zones.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "active_support/core_ext/string/conversions"
 require "active_support/core_ext/time/zones"
 
-- 
cgit v1.2.3