aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/configuring.md
diff options
context:
space:
mode:
authorGeorge Claghorn <george.claghorn@gmail.com>2018-12-31 14:20:35 -0500
committerGitHub <noreply@github.com>2018-12-31 14:20:35 -0500
commit3690eb1ba2081c18294fe9f18c25d07a2a21907c (patch)
treea6402de4ef1326f4ec1dffe216bffbe5267a9bcb /guides/source/configuring.md
parent7bc307acf842b29c3569d2c63eaa3b02efe2ac22 (diff)
parentb9d08fdc4d6a19179ecef7ff395bbd86b20a90b4 (diff)
downloadrails-3690eb1ba2081c18294fe9f18c25d07a2a21907c.tar.gz
rails-3690eb1ba2081c18294fe9f18c25d07a2a21907c.tar.bz2
rails-3690eb1ba2081c18294fe9f18c25d07a2a21907c.zip
Merge pull request #34834 from gmcgibbon/mention_tiff_support_in_guides
Mention tiff support in ActiveStorage guides
Diffstat (limited to 'guides/source/configuring.md')
-rw-r--r--guides/source/configuring.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index ae1de3079f..7193278581 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -815,7 +815,7 @@ normal Rails server.
config.active_storage.paths[:ffprobe] = '/usr/local/bin/ffprobe'
```
-* `config.active_storage.variable_content_types` accepts an array of strings indicating the content types that Active Storage can transform through ImageMagick. The default is `%w(image/png image/gif image/jpg image/jpeg image/pjpeg image/vnd.adobe.photoshop image/vnd.microsoft.icon)`.
+* `config.active_storage.variable_content_types` accepts an array of strings indicating the content types that Active Storage can transform through ImageMagick. The default is `%w(image/png image/gif image/jpg image/jpeg image/pjpeg image/tiff image/vnd.adobe.photoshop image/vnd.microsoft.icon)`.
* `config.active_storage.content_types_to_serve_as_binary` accepts an array of strings indicating the content types that Active Storage will always serve as an attachment, rather than inline. The default is `%w(text/html
text/javascript image/svg+xml application/postscript application/x-shockwave-flash text/xml application/xml application/xhtml+xml)`.