diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-01-25 15:37:07 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2016-01-25 15:37:07 -0800 |
| commit | c9d336382a503769b331113ee11d6b09a6f8583b (patch) | |
| tree | 48d716c8c279fe63f69f7bb55851762b4fa9e0bf /actionpack | |
| parent | 3b4398bb605cc7b6f475bf76c19aa0702700a199 (diff) | |
| parent | 20f943b5e88f2cfea0255a299c301ebafb4430b3 (diff) | |
| download | rails-c9d336382a503769b331113ee11d6b09a6f8583b.tar.gz rails-c9d336382a503769b331113ee11d6b09a6f8583b.tar.bz2 rails-c9d336382a503769b331113ee11d6b09a6f8583b.zip | |
Merge pull request #23250 from simi/3-2-stable-1-8
Fix 3-2-stable 1.8 compatibility.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/template/resolver.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb index c6db6685e4..d3a6d1a3b8 100644 --- a/actionpack/lib/action_view/template/resolver.rb +++ b/actionpack/lib/action_view/template/resolver.rb @@ -110,7 +110,7 @@ module ActionView super() end - cattr_accessor :allow_external_files, instance_reader: false, instance_writer: false + cattr_accessor :allow_external_files, :instance_reader => false, :instance_writer => false self.allow_external_files = false private |