Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
e36c0c14
Commit
e36c0c14
authored
May 15, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3950 from bbodenmiller/patch-4
fixes #3115 and adds support for gif bmp & tiff images
parents
ac148c50
fb4a38f6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
app/uploaders/attachment_uploader.rb
app/uploaders/attachment_uploader.rb
+3
-3
No files found.
app/uploaders/attachment_uploader.rb
View file @
e36c0c14
...
@@ -8,12 +8,12 @@ class AttachmentUploader < CarrierWave::Uploader::Base
...
@@ -8,12 +8,12 @@ class AttachmentUploader < CarrierWave::Uploader::Base
end
end
def
image?
def
image?
img_ext
=
%w(png jpg jpeg)
img_ext
=
%w(png jpg jpeg
gif bmp tiff
)
if
file
.
respond_to?
(
:extension
)
if
file
.
respond_to?
(
:extension
)
img_ext
.
include?
(
file
.
extension
)
img_ext
.
include?
(
file
.
extension
.
downcase
)
else
else
# Not all CarrierWave storages respond to :extension
# Not all CarrierWave storages respond to :extension
ext
=
file
.
path
.
split
(
'.'
).
last
ext
=
file
.
path
.
split
(
'.'
).
last
.
downcase
img_ext
.
include?
(
ext
)
img_ext
.
include?
(
ext
)
end
end
rescue
rescue
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment