diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-31 14:32:26 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-31 14:32:26 +0000 |
| commit | ed60021f39f7913537dcad181e4061e423dc6c3d (patch) | |
| tree | 86532c43aabe9125422f84b48a899f2672900bf5 /actionpack/lib/action_view/paths.rb | |
| parent | c6af337d2d6c86792cdc8132224ebe9294d35774 (diff) | |
| parent | b3a028259f373fd58fea2171a1e9e8b2fe3e253a (diff) | |
| download | rails-ed60021f39f7913537dcad181e4061e423dc6c3d.tar.gz rails-ed60021f39f7913537dcad181e4061e423dc6c3d.tar.bz2 rails-ed60021f39f7913537dcad181e4061e423dc6c3d.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
activemodel/lib/active_model/state_machine.rb
Diffstat (limited to 'actionpack/lib/action_view/paths.rb')
| -rw-r--r-- | actionpack/lib/action_view/paths.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb index 0059b79e5f..6e55d69d00 100644 --- a/actionpack/lib/action_view/paths.rb +++ b/actionpack/lib/action_view/paths.rb @@ -45,7 +45,7 @@ module ActionView #:nodoc: end end - raise ActionView::MissingTemplate.new(self, "#{prefix}/#{path} - #{details.inspect} - partial: #{!!partial}") + raise ActionView::MissingTemplate.new(self, "#{prefix}/#{path}", details, partial) end def exists?(path, extension = nil, prefix = nil, partial = false) |