aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/actions.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-06-20 06:48:17 -0700
committerJosé Valim <jose.valim@gmail.com>2011-06-20 06:48:17 -0700
commit89b3293a54f14d4787d79ab275a6492964c7e3e1 (patch)
tree83b806fff3612545092682767b95d90da342816f /railties/lib/rails/generators/actions.rb
parentb7c8e0bb0c70070d6fa28e3da1566e0ffaf27704 (diff)
parent93f488e7fa81f6cc18e6b158073979c0fd0c3c3d (diff)
downloadrails-89b3293a54f14d4787d79ab275a6492964c7e3e1.tar.gz
rails-89b3293a54f14d4787d79ab275a6492964c7e3e1.tar.bz2
rails-89b3293a54f14d4787d79ab275a6492964c7e3e1.zip
Merge pull request #1784 from gazay/3-1-stable-shadowing-variables
Removing shadowing outer local variables warnings
Diffstat (limited to 'railties/lib/rails/generators/actions.rb')
-rw-r--r--railties/lib/rails/generators/actions.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index d31a3262e3..433a56dc57 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -114,11 +114,11 @@ module Rails
# git :add => "this.file that.rb"
# git :add => "onefile.rb", :rm => "badfile.cxx"
#
- def git(command={})
- if command.is_a?(Symbol)
- run "git #{command}"
+ def git(commands={})
+ if commands.is_a?(Symbol)
+ run "git #{commands}"
else
- command.each do |command, options|
+ commands.each do |command, options|
run "git #{command} #{options}"
end
end