diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2017-07-18 13:42:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 13:42:57 -0400 |
| commit | 36ff7b63ec083924a5b407cf3df7ae90e22183e2 (patch) | |
| tree | 8cbdbe138f13a0dc7c3666f036fda685c644d262 /activemodel/test/cases/serializers/json_serialization_test.rb | |
| parent | 425ba83c28214ca97c5d3600c16ad7a796cd33e6 (diff) | |
| parent | f47bac481949a69a519ea7d833e1a8d435332d52 (diff) | |
| download | rails-36ff7b63ec083924a5b407cf3df7ae90e22183e2.tar.gz rails-36ff7b63ec083924a5b407cf3df7ae90e22183e2.tar.bz2 rails-36ff7b63ec083924a5b407cf3df7ae90e22183e2.zip | |
Merge branch 'master' into fix_unscope_where_column_with_or
Diffstat (limited to 'activemodel/test/cases/serializers/json_serialization_test.rb')
| -rw-r--r-- | activemodel/test/cases/serializers/json_serialization_test.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activemodel/test/cases/serializers/json_serialization_test.rb b/activemodel/test/cases/serializers/json_serialization_test.rb index d15ba64eb0..aae98c9fe4 100644 --- a/activemodel/test/cases/serializers/json_serialization_test.rb +++ b/activemodel/test/cases/serializers/json_serialization_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "cases/helper" require "models/contact" require "active_support/core_ext/object/instance_variables" |