aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-04-02 03:26:31 +0900
committerGitHub <noreply@github.com>2019-04-02 03:26:31 +0900
commite4e12185837c1aa9233e4669d0a54b54173e1bf1 (patch)
tree8a63972a1b3317906a04dccbe76146716c5a4a0e /actionview/lib/action_view
parenta835fba44f23637aa8d043a46cbc3799f644bea1 (diff)
parent771973c13dd5b68fe96fbe5ea96bd11656437dc1 (diff)
downloadrails-e4e12185837c1aa9233e4669d0a54b54173e1bf1.tar.gz
rails-e4e12185837c1aa9233e4669d0a54b54173e1bf1.tar.bz2
rails-e4e12185837c1aa9233e4669d0a54b54173e1bf1.zip
Merge pull request #35820 from sharang-d/url-to-URL-except-actionpack
url -> URL where apt except inside actionpack/
Diffstat (limited to 'actionview/lib/action_view')
-rw-r--r--actionview/lib/action_view/helpers/form_tag_helper.rb2
-rw-r--r--actionview/lib/action_view/helpers/url_helper.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/helpers/form_tag_helper.rb b/actionview/lib/action_view/helpers/form_tag_helper.rb
index c0996049f0..5d4ff36425 100644
--- a/actionview/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionview/lib/action_view/helpers/form_tag_helper.rb
@@ -24,7 +24,7 @@ module ActionView
mattr_accessor :default_enforce_utf8, default: true
- # Starts a form tag that points the action to a url configured with <tt>url_for_options</tt> just like
+ # Starts a form tag that points the action to a URL configured with <tt>url_for_options</tt> just like
# ActionController::Base#url_for. The method for the form defaults to POST.
#
# ==== Options
diff --git a/actionview/lib/action_view/helpers/url_helper.rb b/actionview/lib/action_view/helpers/url_helper.rb
index d63ada3890..df83dff681 100644
--- a/actionview/lib/action_view/helpers/url_helper.rb
+++ b/actionview/lib/action_view/helpers/url_helper.rb
@@ -553,7 +553,7 @@ module ActionView
url_string = URI.parser.unescape(url_for(options)).force_encoding(Encoding::BINARY)
# We ignore any extra parameters in the request_uri if the
- # submitted url doesn't have any either. This lets the function
+ # submitted URL doesn't have any either. This lets the function
# work with things like ?order=asc
# the behaviour can be disabled with check_parameters: true
request_uri = url_string.index("?") || check_parameters ? request.fullpath : request.path