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.
---
 activerecord/lib/active_record/associations/preloader/association.rb     | 1 -
 activerecord/lib/active_record/associations/preloader/belongs_to.rb      | 1 -
 .../lib/active_record/associations/preloader/collection_association.rb   | 1 -
 activerecord/lib/active_record/associations/preloader/has_many.rb        | 1 -
 .../lib/active_record/associations/preloader/has_many_through.rb         | 1 -
 activerecord/lib/active_record/associations/preloader/has_one.rb         | 1 -
 activerecord/lib/active_record/associations/preloader/has_one_through.rb | 1 -
 .../lib/active_record/associations/preloader/singular_association.rb     | 1 -
 .../lib/active_record/associations/preloader/through_association.rb      | 1 -
 9 files changed, 9 deletions(-)

(limited to 'activerecord/lib/active_record/associations/preloader')

diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb
index 6a8425c989..63ef3f2d8c 100644
--- a/activerecord/lib/active_record/associations/preloader/association.rb
+++ b/activerecord/lib/active_record/associations/preloader/association.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module ActiveRecord
   module Associations
     class Preloader
diff --git a/activerecord/lib/active_record/associations/preloader/belongs_to.rb b/activerecord/lib/active_record/associations/preloader/belongs_to.rb
index ee7be18d15..c20145770f 100644
--- a/activerecord/lib/active_record/associations/preloader/belongs_to.rb
+++ b/activerecord/lib/active_record/associations/preloader/belongs_to.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module ActiveRecord
   module Associations
     class Preloader
diff --git a/activerecord/lib/active_record/associations/preloader/collection_association.rb b/activerecord/lib/active_record/associations/preloader/collection_association.rb
index 59c0bc4d8e..26690bf16d 100644
--- a/activerecord/lib/active_record/associations/preloader/collection_association.rb
+++ b/activerecord/lib/active_record/associations/preloader/collection_association.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module ActiveRecord
   module Associations
     class Preloader
diff --git a/activerecord/lib/active_record/associations/preloader/has_many.rb b/activerecord/lib/active_record/associations/preloader/has_many.rb
index 197f561b95..20df1cc19a 100644
--- a/activerecord/lib/active_record/associations/preloader/has_many.rb
+++ b/activerecord/lib/active_record/associations/preloader/has_many.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module ActiveRecord
   module Associations
     class Preloader
diff --git a/activerecord/lib/active_record/associations/preloader/has_many_through.rb b/activerecord/lib/active_record/associations/preloader/has_many_through.rb
index 3bd561c187..2029871f39 100644
--- a/activerecord/lib/active_record/associations/preloader/has_many_through.rb
+++ b/activerecord/lib/active_record/associations/preloader/has_many_through.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module ActiveRecord
   module Associations
     class Preloader
diff --git a/activerecord/lib/active_record/associations/preloader/has_one.rb b/activerecord/lib/active_record/associations/preloader/has_one.rb
index d6254d8c56..c4add621ca 100644
--- a/activerecord/lib/active_record/associations/preloader/has_one.rb
+++ b/activerecord/lib/active_record/associations/preloader/has_one.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module ActiveRecord
   module Associations
     class Preloader
diff --git a/activerecord/lib/active_record/associations/preloader/has_one_through.rb b/activerecord/lib/active_record/associations/preloader/has_one_through.rb
index 512ca82005..f063f85574 100644
--- a/activerecord/lib/active_record/associations/preloader/has_one_through.rb
+++ b/activerecord/lib/active_record/associations/preloader/has_one_through.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module ActiveRecord
   module Associations
     class Preloader
diff --git a/activerecord/lib/active_record/associations/preloader/singular_association.rb b/activerecord/lib/active_record/associations/preloader/singular_association.rb
index 5583c7d79c..5c5828262e 100644
--- a/activerecord/lib/active_record/associations/preloader/singular_association.rb
+++ b/activerecord/lib/active_record/associations/preloader/singular_association.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module ActiveRecord
   module Associations
     class Preloader
diff --git a/activerecord/lib/active_record/associations/preloader/through_association.rb b/activerecord/lib/active_record/associations/preloader/through_association.rb
index 8e12afc695..34587fd3f5 100644
--- a/activerecord/lib/active_record/associations/preloader/through_association.rb
+++ b/activerecord/lib/active_record/associations/preloader/through_association.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module ActiveRecord
   module Associations
     class Preloader
-- 
cgit v1.2.3