aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-10 07:34:53 -0800
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-10 07:34:53 -0800
commit62039ad5a1fd5e2a9a713d8bfd10e0d0e50fe02f (patch)
treee7f9a2ea4bd5a0303ab6dceabdd3ab45292cfcf0
parente803f3a521d34cdefa1d248beba34e2a9060603d (diff)
parentc33c991eabd628b172bc219de1bf25fd75e93c93 (diff)
downloadrails-62039ad5a1fd5e2a9a713d8bfd10e0d0e50fe02f.tar.gz
rails-62039ad5a1fd5e2a9a713d8bfd10e0d0e50fe02f.tar.bz2
rails-62039ad5a1fd5e2a9a713d8bfd10e0d0e50fe02f.zip
Merge pull request #8165 from arunagw/warning_removed_unused_variables
Removing warning : assigned but unused variable
-rw-r--r--railties/lib/rails/commands/dbconsole.rb2
-rw-r--r--railties/test/commands/console_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index c84fa832f5..90359d1c08 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -154,7 +154,7 @@ module Rails
full_path_command = nil
found = commands.detect do |cmd|
- dir = dirs_on_path.detect do |path|
+ dirs_on_path.detect do |path|
full_path_command = File.join(path, cmd)
File.executable? full_path_command
end
diff --git a/railties/test/commands/console_test.rb b/railties/test/commands/console_test.rb
index e047d4882d..f99ea13022 100644
--- a/railties/test/commands/console_test.rb
+++ b/railties/test/commands/console_test.rb
@@ -110,7 +110,7 @@ class Rails::ConsoleTest < ActiveSupport::TestCase
def start(argv = [])
rails_console = Rails::Console.new(app, parse_arguments(argv))
- @output = output = capture(:stdout) { rails_console.start }
+ @output = capture(:stdout) { rails_console.start }
end
def app