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.
---
 activemodel/test/models/account.rb               | 1 -
 activemodel/test/models/blog_post.rb             | 1 -
 activemodel/test/models/contact.rb               | 1 -
 activemodel/test/models/custom_reader.rb         | 1 -
 activemodel/test/models/helicopter.rb            | 1 -
 activemodel/test/models/person.rb                | 1 -
 activemodel/test/models/person_with_validator.rb | 1 -
 activemodel/test/models/reply.rb                 | 1 -
 activemodel/test/models/sheep.rb                 | 1 -
 activemodel/test/models/topic.rb                 | 1 -
 activemodel/test/models/track_back.rb            | 1 -
 activemodel/test/models/user.rb                  | 1 -
 activemodel/test/models/visitor.rb               | 1 -
 13 files changed, 13 deletions(-)

(limited to 'activemodel/test/models')

diff --git a/activemodel/test/models/account.rb b/activemodel/test/models/account.rb
index c25d12e138..eed668d38f 100644
--- a/activemodel/test/models/account.rb
+++ b/activemodel/test/models/account.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Account
   include ActiveModel::ForbiddenAttributesProtection
 
diff --git a/activemodel/test/models/blog_post.rb b/activemodel/test/models/blog_post.rb
index 2a6240fb04..46eba857df 100644
--- a/activemodel/test/models/blog_post.rb
+++ b/activemodel/test/models/blog_post.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module Blog
   def self.use_relative_model_naming?
     true
diff --git a/activemodel/test/models/contact.rb b/activemodel/test/models/contact.rb
index 9853bc6234..113ab0bc1f 100644
--- a/activemodel/test/models/contact.rb
+++ b/activemodel/test/models/contact.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Contact
   extend ActiveModel::Naming
   include ActiveModel::Conversion
diff --git a/activemodel/test/models/custom_reader.rb b/activemodel/test/models/custom_reader.rb
index a6f983e3ca..dc26bb10ff 100644
--- a/activemodel/test/models/custom_reader.rb
+++ b/activemodel/test/models/custom_reader.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class CustomReader
   include ActiveModel::Validations
 
diff --git a/activemodel/test/models/helicopter.rb b/activemodel/test/models/helicopter.rb
index 33877e1fba..933f3c463a 100644
--- a/activemodel/test/models/helicopter.rb
+++ b/activemodel/test/models/helicopter.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Helicopter
   include ActiveModel::Conversion
 end
diff --git a/activemodel/test/models/person.rb b/activemodel/test/models/person.rb
index 94a3275514..e896e90f98 100644
--- a/activemodel/test/models/person.rb
+++ b/activemodel/test/models/person.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Person
   include ActiveModel::Validations
   extend  ActiveModel::Translation
diff --git a/activemodel/test/models/person_with_validator.rb b/activemodel/test/models/person_with_validator.rb
index b32730abc1..505ed880c1 100644
--- a/activemodel/test/models/person_with_validator.rb
+++ b/activemodel/test/models/person_with_validator.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class PersonWithValidator
   include ActiveModel::Validations
 
diff --git a/activemodel/test/models/reply.rb b/activemodel/test/models/reply.rb
index 9a6b4864f1..3fe11043d2 100644
--- a/activemodel/test/models/reply.rb
+++ b/activemodel/test/models/reply.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "models/topic"
 
 class Reply < Topic
diff --git a/activemodel/test/models/sheep.rb b/activemodel/test/models/sheep.rb
index f62a98777a..7aba055c4f 100644
--- a/activemodel/test/models/sheep.rb
+++ b/activemodel/test/models/sheep.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Sheep
   extend ActiveModel::Naming
 end
diff --git a/activemodel/test/models/topic.rb b/activemodel/test/models/topic.rb
index 37dc437e81..192786c096 100644
--- a/activemodel/test/models/topic.rb
+++ b/activemodel/test/models/topic.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Topic
   include ActiveModel::Validations
   include ActiveModel::Validations::Callbacks
diff --git a/activemodel/test/models/track_back.rb b/activemodel/test/models/track_back.rb
index 80c4075b00..357ee37d6d 100644
--- a/activemodel/test/models/track_back.rb
+++ b/activemodel/test/models/track_back.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Post
   class TrackBack
     def to_model
diff --git a/activemodel/test/models/user.rb b/activemodel/test/models/user.rb
index 106b487cbc..6556b1a7d9 100644
--- a/activemodel/test/models/user.rb
+++ b/activemodel/test/models/user.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class User
   extend ActiveModel::Callbacks
   include ActiveModel::SecurePassword
diff --git a/activemodel/test/models/visitor.rb b/activemodel/test/models/visitor.rb
index 5bcd5d6458..22ad1a3c3d 100644
--- a/activemodel/test/models/visitor.rb
+++ b/activemodel/test/models/visitor.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Visitor
   extend ActiveModel::Callbacks
   include ActiveModel::SecurePassword
-- 
cgit v1.2.3