diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2013-03-31 08:53:01 -0700 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2013-03-31 08:53:01 -0700 |
| commit | 2f53c27b81ffaf3607279e4aca36eef38e2e6a5b (patch) | |
| tree | ee47b97fc0993f0355f0da05c06f3e9fba486b58 | |
| parent | fb613cb5d15d63ed825d99eaf9dcc7dc8e5ded4e (diff) | |
| parent | f23e7eba52ccdb8e9c94334bff1a8e2dc2da22b7 (diff) | |
| download | rails-2f53c27b81ffaf3607279e4aca36eef38e2e6a5b.tar.gz rails-2f53c27b81ffaf3607279e4aca36eef38e2e6a5b.tar.bz2 rails-2f53c27b81ffaf3607279e4aca36eef38e2e6a5b.zip | |
Merge pull request #10015 from vipulnsward/remove_unused_variable_in_get
remove unused variable and assignment
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_options_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 2 |
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 |