aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller/layouts.rb
diff options
context:
space:
mode:
authorAlexey Vakhov <vakhov@gmail.com>2012-03-10 09:57:50 +0400
committerAlexey Vakhov <vakhov@gmail.com>2012-03-10 09:57:50 +0400
commitc16f4f1f38c8d209379cfec45b259538aba61c7c (patch)
tree4a0667a0fd7e71d2efe914dce96b89e1b012c2d6 /actionpack/lib/abstract_controller/layouts.rb
parenta39ee473128f3d33538f7b6cd5edf1d000f5d80e (diff)
downloadrails-c16f4f1f38c8d209379cfec45b259538aba61c7c.tar.gz
rails-c16f4f1f38c8d209379cfec45b259538aba61c7c.tar.bz2
rails-c16f4f1f38c8d209379cfec45b259538aba61c7c.zip
Fix exceptions messages in AC layouts
Diffstat (limited to 'actionpack/lib/abstract_controller/layouts.rb')
-rw-r--r--actionpack/lib/abstract_controller/layouts.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index 92e93cbee7..dec406a778 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -304,7 +304,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
@@ -364,7 +364,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