summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-05-04 10:26:31 +0000
committerGo MAEDA <maeda@farend.jp>2019-05-04 10:26:31 +0000
commit5b5298bac05ac272d6aafee73990d6b098c35bce (patch)
treee2ed1143af2282e087657843cc601ff2a1e1cc0e /app
parentb4562c3989804da8214211fa34221fd8e8067b8e (diff)
downloadredmine-5b5298bac05ac272d6aafee73990d6b098c35bce.tar.gz
redmine-5b5298bac05ac272d6aafee73990d6b098c35bce.zip
Merged r18122 from trunk to 4.0-stable (#29259).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18123 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/models/attachment.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index cc9b5f930..3affca0ba 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -235,7 +235,7 @@ class Attachment < ActiveRecord::Base
end
def is_text?
- Redmine::MimeType.is_type?('text', filename)
+ Redmine::MimeType.is_type?('text', filename) || Redmine::SyntaxHighlighting.filename_supported?(filename)
end
def is_image?