Skip to content

Commit 9f4f0bb

Browse files
authored
Merge pull request rails#51422 from skipkayhil/hm-fix-actionpack-md
Regenerate some broken markdown in Action Pack [ci-skip]
2 parents 41e3121 + 5df5ddc commit 9f4f0bb

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

actionpack/lib/action_controller/metal/conditional_get.rb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ def etag(&etagger)
4242
#
4343
# `:etag`
4444
# : Sets a "weak" ETag validator on the response. See the `:weak_etag` option.
45+
#
4546
# `:weak_etag`
4647
# : Sets a "weak" ETag validator on the response. Requests that specify an
4748
# `If-None-Match` header may receive a `304 Not Modified` response if the
@@ -51,6 +52,7 @@ def etag(&etagger)
5152
# they're good for caching HTML pages in browser caches. They can't be used
5253
# for responses that must be byte-identical, like serving `Range` requests
5354
# within a PDF file.
55+
#
5456
# `:strong_etag`
5557
# : Sets a "strong" ETag validator on the response. Requests that specify an
5658
# `If-None-Match` header may receive a `304 Not Modified` response if the
@@ -60,19 +62,23 @@ def etag(&etagger)
6062
# byte. This is necessary for serving `Range` requests within a large video
6163
# or PDF file, for example, or for compatibility with some CDNs that don't
6264
# support weak ETags.
65+
#
6366
# `:last_modified`
6467
# : Sets a "weak" last-update validator on the response. Subsequent requests
6568
# that specify an `If-Modified-Since` header may receive a `304 Not
6669
# Modified` response if `last_modified` <= `If-Modified-Since`.
70+
#
6771
# `:public`
6872
# : By default the `Cache-Control` header is private. Set this option to
6973
# `true` if you want your application to be cacheable by other devices, such
7074
# as proxy caches.
75+
#
7176
# `:cache_control`
7277
# : When given, will overwrite an existing `Cache-Control` header. For a list
7378
# of `Cache-Control` directives, see the [article on
7479
# MDN](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Contr
7580
# ol).
81+
#
7682
# `:template`
7783
# : By default, the template digest for the current controller/action is
7884
# included in ETags. If the action renders a different template, you can
@@ -244,10 +250,13 @@ def stale?(object = nil, **freshness_kwargs)
244250
# `:public`
245251
# : If true, replaces the default `private` directive with the `public`
246252
# directive.
253+
#
247254
# `:must_revalidate`
248255
# : If true, adds the `must-revalidate` directive.
256+
#
249257
# `:stale_while_revalidate`
250258
# : Sets the value of the `stale-while-revalidate` directive.
259+
#
251260
# `:stale_if_error`
252261
# : Sets the value of the `stale-if-error` directive.
253262
#
@@ -306,7 +315,6 @@ def expires_now
306315
# * `public`: By default, HTTP responses are private, cached only on the
307316
# user's web browser. To allow proxies to cache the response, set `true` to
308317
# indicate that they can serve the cached response to all users.
309-
#
310318
def http_cache_forever(public: false)
311319
expires_in 100.years, public: public
312320

0 commit comments

Comments
 (0)