aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-08-24 16:52:23 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-08-24 16:52:23 -0700
commit68424fb1cf45acda3ad1daef30136f3bcd4f9f9d (patch)
tree1e8f9b35fb786c3c445f5525543e8f3b1d83fc77 /railties
parent32836e7a538118d4ed831ded7fce0ae83fc3d860 (diff)
downloadrails-68424fb1cf45acda3ad1daef30136f3bcd4f9f9d.tar.gz
rails-68424fb1cf45acda3ad1daef30136f3bcd4f9f9d.tar.bz2
rails-68424fb1cf45acda3ad1daef30136f3bcd4f9f9d.zip
fix ambiguous * and remove unused variable
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index fdafc91fcb..27f8d13ce8 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -77,7 +77,7 @@ module Rails
fallbacks.merge! config.fallbacks
templates_path.concat config.templates
templates_path.uniq!
- hide_namespaces *config.hidden_namespaces
+ hide_namespaces(*config.hidden_namespaces)
end
def self.templates_path
@@ -313,7 +313,7 @@ module Rails
begin
path = path.sub("#{base}/", "")
require path
- rescue Exception => e
+ rescue Exception
# No problem
end
end