diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2019-07-08 10:20:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-08 10:20:45 -0500 |
| commit | c00cd7b446aaeb8e2486142938238b26c48ed711 (patch) | |
| tree | d33b5cb6ab8bf61f4f04ac5731c54a2336661461 /actionview | |
| parent | fe30211574648fa21bff958a3cf952fd0c20c3b1 (diff) | |
| parent | 84ff4f6ea2a118b47160e3fe7ed29bff52c2a7a2 (diff) | |
| download | rails-c00cd7b446aaeb8e2486142938238b26c48ed711.tar.gz rails-c00cd7b446aaeb8e2486142938238b26c48ed711.tar.bz2 rails-c00cd7b446aaeb8e2486142938238b26c48ed711.zip | |
Merge branch 'master' into add_database_exist_method
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | actionview/lib/action_view.rb | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index c663ec3bbc..f2f57e6a36 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,3 +1,7 @@ +* Add autoload for SyntaxErrorInTemplate so syntax errors are correctly raised by DebugExceptions. + + *Guilherme Mansur*, *Gannon McGibbon* + * `RenderingHelper` supports rendering objects that `respond_to?` `:render_in` *Joel Hawksley*, *Natasha Umer*, *Aaron Patterson*, *Shawn Allen*, *Emily Plummer*, *Diana Mounter*, *John Hawthorn*, *Nathan Herald*, *Zaid Zawaideh*, *Zach Ahn* diff --git a/actionview/lib/action_view.rb b/actionview/lib/action_view.rb index 7f85bf2a5e..11b4563548 100644 --- a/actionview/lib/action_view.rb +++ b/actionview/lib/action_view.rb @@ -77,6 +77,7 @@ module ActionView autoload :ActionViewError autoload :EncodingError autoload :TemplateError + autoload :SyntaxErrorInTemplate autoload :WrongEncodingError end end |