diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-03-16 03:25:09 -0700 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2012-03-16 03:25:09 -0700 |
| commit | fc6b961b09b2d057f5820ef2152f6cbf8acbfeea (patch) | |
| tree | a5e3bc62ea65f6b0e9fea01b8157f0d6bb8e5130 /actionpack/lib/abstract_controller | |
| parent | fa7a3aaac734da7efef17039a934154f64144796 (diff) | |
| parent | c16f4f1f38c8d209379cfec45b259538aba61c7c (diff) | |
| download | rails-fc6b961b09b2d057f5820ef2152f6cbf8acbfeea.tar.gz rails-fc6b961b09b2d057f5820ef2152f6cbf8acbfeea.tar.bz2 rails-fc6b961b09b2d057f5820ef2152f6cbf8acbfeea.zip | |
Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgs
Fix exceptions messages in AC layouts
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index 3897287af5..6f13ebe0d0 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -311,7 +311,7 @@ module AbstractController when false nil when true - raise ArgumentError, "Layouts must be specified as a String, Symbol, false, or nil" + raise ArgumentError, "Layouts must be specified as a String, Symbol, Proc, false, or nil" when nil name_clause end @@ -371,7 +371,7 @@ module AbstractController when false, nil then nil else raise ArgumentError, - "String, true, or false, expected for `layout'; you passed #{name.inspect}" + "String, Proc, :default, true, or false, expected for `layout'; you passed #{name.inspect}" end end |