Merged r16285 (#24199).

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16294 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2017-01-29 10:39:34 +00:00
parent 730f1c3071
commit 46e11396b8
2 changed files with 2 additions and 2 deletions

View File

@@ -197,7 +197,7 @@ class AttachmentsController < ApplicationController
end
def disposition(attachment)
if attachment.is_image? || attachment.is_pdf?
if attachment.is_pdf?
'inline'
else
'attachment'