aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2013-03-31 19:34:40 +0530
committerVipul A M <vipulnsward@gmail.com>2013-03-31 19:34:40 +0530
commitf23e7eba52ccdb8e9c94334bff1a8e2dc2da22b7 (patch)
tree635267223c4fea25bdb496f56587257b0e3d3a93
parent3b0b573ac3ecbec5b1fa021abbe86b267bbefb8c (diff)
downloadrails-f23e7eba52ccdb8e9c94334bff1a8e2dc2da22b7.tar.gz
rails-f23e7eba52ccdb8e9c94334bff1a8e2dc2da22b7.tar.bz2
rails-f23e7eba52ccdb8e9c94334bff1a8e2dc2da22b7.zip
remove unused variable and assignment
-rw-r--r--actionpack/lib/action_view/helpers/form_options_helper.rb2
-rw-r--r--actionpack/test/abstract_unit.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index 377819a80c..8368e3de43 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -752,7 +752,7 @@ module ActionView
end
def prompt_text(prompt)
- prompt = prompt.kind_of?(String) ? prompt : I18n.translate('helpers.select.prompt', :default => 'Please select')
+ prompt.kind_of?(String) ? prompt : I18n.translate('helpers.select.prompt', :default => 'Please select')
end
end
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 7157bccfb3..8213997f4e 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -332,7 +332,7 @@ end
module ActionDispatch
module RoutingVerbs
- def get(uri_or_host, path = nil, port = nil)
+ def get(uri_or_host, path = nil)
host = uri_or_host.host unless path
path ||= uri_or_host.path