Merged branch master into master

abecms · Nov 18, 2016 · b853a02 · b853a02
2 parents 21686b8 + 6c2f8d6
commit b853a02
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "abe-cli",
-  "version": "2.7.4",
+  "version": "2.7.7",
   "description": "Abe command line tool",
   "main": "src/server/app.js",
   "repository": {

diff --git a/src/server/routes/post-upload.js b/src/server/routes/post-upload.js
@@ -40,9 +40,9 @@ var route = function(req, res, next){
       returnErr('file is too big')
     })
 
-    if (mimetype !== 'image/jpeg' && mimetype !== 'image/png' && mimetype !== 'image/svg+xml' && mimetype !== 'video/mp4') {
+    if (mimetype !== 'image/gif' && mimetype !== 'image/jpeg' && mimetype !== 'image/png' && mimetype !== 'image/svg+xml' && mimetype !== 'video/mp4') {
       returnErr('unauthorized file')
-    } else if (ext !== '.jpg' && ext !== '.jpeg' && ext !== '.png' && ext !== '.svg' && ext !== '.mp4') {
+    } else if (ext !== '.gif' && ext !== '.jpg' && ext !== '.jpeg' && ext !== '.png' && ext !== '.svg' && ext !== '.mp4') {
       returnErr('not a valid asset')
     }