diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-07-02 02:15:17 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2017-07-02 02:15:17 +0930 |
| commit | 87b3e226d65ac1ed371620bfdcd2f950c87cfece (patch) | |
| tree | 33d690f194f243a3fb63e69f8393ff46cc396249 /activerecord/test/models/admin | |
| parent | 3420a14590c0e6915d8b6c242887f74adb4120f9 (diff) | |
| download | rails-87b3e226d65ac1ed371620bfdcd2f950c87cfece.tar.gz rails-87b3e226d65ac1ed371620bfdcd2f950c87cfece.tar.bz2 rails-87b3e226d65ac1ed371620bfdcd2f950c87cfece.zip | |
Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"
This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing
changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
Diffstat (limited to 'activerecord/test/models/admin')
| -rw-r--r-- | activerecord/test/models/admin/account.rb | 1 | ||||
| -rw-r--r-- | activerecord/test/models/admin/randomly_named_c1.rb | 15 | ||||
| -rw-r--r-- | activerecord/test/models/admin/user.rb | 1 |
3 files changed, 7 insertions, 10 deletions
diff --git a/activerecord/test/models/admin/account.rb b/activerecord/test/models/admin/account.rb index 2dddfa8fe9..bd23192d20 100644 --- a/activerecord/test/models/admin/account.rb +++ b/activerecord/test/models/admin/account.rb @@ -1,4 +1,3 @@ -# frozen_string_literal: true class Admin::Account < ActiveRecord::Base has_many :users end diff --git a/activerecord/test/models/admin/randomly_named_c1.rb b/activerecord/test/models/admin/randomly_named_c1.rb index dc1c8c66d7..b64ae7fc41 100644 --- a/activerecord/test/models/admin/randomly_named_c1.rb +++ b/activerecord/test/models/admin/randomly_named_c1.rb @@ -1,8 +1,7 @@ -# frozen_string_literal: true -class Admin::ClassNameThatDoesNotFollowCONVENTIONS1 < ActiveRecord::Base - self.table_name = :randomly_named_table2 -end - -class Admin::ClassNameThatDoesNotFollowCONVENTIONS2 < ActiveRecord::Base - self.table_name = :randomly_named_table3 -end +class Admin::ClassNameThatDoesNotFollowCONVENTIONS1 < ActiveRecord::Base
+ self.table_name = :randomly_named_table2
+end
+
+class Admin::ClassNameThatDoesNotFollowCONVENTIONS2 < ActiveRecord::Base
+ self.table_name = :randomly_named_table3
+end
diff --git a/activerecord/test/models/admin/user.rb b/activerecord/test/models/admin/user.rb index 1157ca266c..a76e4b6795 100644 --- a/activerecord/test/models/admin/user.rb +++ b/activerecord/test/models/admin/user.rb @@ -1,4 +1,3 @@ -# frozen_string_literal: true class Admin::User < ActiveRecord::Base class Coder def initialize(default = {}) |