Skip to content

Commit 8b216e8

Browse files
Replace ActionController::UrlFor references [ci-skip]
These references were missed when `ActionController::UrlFor` was converted to `ActionDispatch::Routing::UrlFor` in 226dfc2.
1 parent 06d3707 commit 8b216e8

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

actionpack/lib/action_dispatch/routing/url_for.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module Routing
99
# See ActionDispatch::Routing for general information about routing and <tt>config/routes.rb</tt>.
1010
#
1111
# <b>Tip:</b> If you need to generate URLs from your models or some other place,
12-
# then ActionController::UrlFor is what you're looking for. Read on for
12+
# then ActionDispatch::Routing::UrlFor is what you're looking for. Read on for
1313
# an introduction. In general, this module should not be included on its own,
1414
# as it is usually included by +url_helpers+ (as in <tt>Rails.application.routes.url_helpers</tt>).
1515
#
@@ -25,11 +25,11 @@ module Routing
2525
# # => <a href="/users/new?message=Welcome%21">Click here</a>
2626
#
2727
# +link_to+, and all other functions that require URL generation functionality,
28-
# actually use ActionController::UrlFor under the hood. And in particular,
29-
# they use the ActionController::UrlFor#url_for method. One can generate
28+
# actually use ActionDispatch::Routing::UrlFor under the hood. And in particular,
29+
# they use the ActionDispatch::Routing::UrlFor#url_for method. One can generate
3030
# the same path as the above example by using the following code:
3131
#
32-
# include UrlFor
32+
# include ActionDispatch::Routing::UrlFor
3333
# url_for(controller: 'users',
3434
# action: 'new',
3535
# message: 'Welcome!',
@@ -53,12 +53,12 @@ module Routing
5353
# controllers or your views, then you don't need to explicitly pass the <tt>:host</tt>
5454
# argument.
5555
#
56-
# For convenience reasons, mailers provide a shortcut for ActionController::UrlFor#url_for.
57-
# So within mailers, you only have to type +url_for+ instead of 'ActionController::UrlFor#url_for'
58-
# in full. However, mailers don't have hostname information, and you still have to provide
59-
# the +:host+ argument or set the default host that will be used in all mailers using the
60-
# configuration option +config.action_mailer.default_url_options+. For more information on
61-
# url_for in mailers read the ActionMailer::Base documentation.
56+
# For convenience, mailers also include ActionDispatch::Routing::UrlFor. So
57+
# within mailers, you can use url_for. However, mailers cannot access
58+
# incoming web requests in order to derive hostname information, so you have
59+
# to provide the +:host+ option or set the default host using
60+
# +default_url_options+. For more information on url_for in mailers see the
61+
# ActionMailer::Base documentation.
6262
#
6363
#
6464
# == URL generation for named routes

0 commit comments

Comments
 (0)