aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-07-21 11:02:13 -0300
committerJosé Valim <jose.valim@gmail.com>2010-07-21 17:17:22 +0200
commit79d6f314c68a4d833a47d318b392808d530925c4 (patch)
tree85266eb29e02987433390e1a246c515cae95577e /railties
parent659e3b02ab98c8f043dfb02d997758d122034181 (diff)
downloadrails-79d6f314c68a4d833a47d318b392808d530925c4.tar.gz
rails-79d6f314c68a4d833a47d318b392808d530925c4.tar.bz2
rails-79d6f314c68a4d833a47d318b392808d530925c4.zip
We are doing the same in this conditions
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/configuration.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index 0becb780de..74b2bcaeb1 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -56,9 +56,7 @@ module Rails
return @options[method] if args.empty?
- if method == :rails
- namespace, configuration = :rails, args.shift
- elsif args.first.is_a?(Hash)
+ if method == :rails || args.first.is_a?(Hash)
namespace, configuration = method, args.shift
else
namespace, configuration = args.shift, args.shift