summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2017-03-29 01:16:59 -0400
committerPhil Hughes <me@iamphill.com>2017-04-05 11:49:08 +0100
commitfd8a40783d593993caa76925eae1d54e6fd95c4b (patch)
tree42584066f86ffe50638eaa37ececac598f58533e /config
parentd4d95ad32fb1f47ecb4b6d0e8d9885dba0222453 (diff)
downloadgitlab-ce-fd8a40783d593993caa76925eae1d54e6fd95c4b.tar.gz
Load a preview of Sketch 43 filessketch-preview-files
Sketch 43 files are technically a zip file, so the JavaScript opens the zip file & locates a preview.png which is just a quick preview of the last sketch page edited. After that is loaded it simply places the image into the DOM
Diffstat (limited to 'config')
-rw-r--r--config/dependency_decisions.yml18
-rw-r--r--config/webpack.config.js1
2 files changed, 19 insertions, 0 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml
index 072ed8a3864..fdba1f6541e 100644
--- a/config/dependency_decisions.yml
+++ b/config/dependency_decisions.yml
@@ -326,3 +326,21 @@
:why: https://github.com/domenic/opener/blob/1.4.3/LICENSE.txt
:versions: []
:when: 2017-02-21 22:33:41.729629000 Z
+- - :approve
+ - jszip
+ - :who: Phil Hughes
+ :why: https://github.com/Stuk/jszip/blob/master/LICENSE.markdown
+ :versions: []
+ :when: 2017-04-05 10:38:46.275721000 Z
+- - :approve
+ - jszip-utils
+ - :who: Phil Hughes
+ :why: https://github.com/Stuk/jszip-utils/blob/master/LICENSE.markdown
+ :versions: []
+ :when: 2017-04-05 10:39:32.676232000 Z
+- - :approve
+ - pako
+ - :who: Phil Hughes
+ :why: https://github.com/nodeca/pako/blob/master/LICENSE
+ :versions: []
+ :when: 2017-04-05 10:43:45.897720000 Z
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 36c09c14d56..99596ce2197 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -37,6 +37,7 @@ var config = {
monitoring: './monitoring/monitoring_bundle.js',
network: './network/network_bundle.js',
notebook_viewer: './blob/notebook_viewer.js',
+ sketch_viewer: './blob/sketch_viewer.js',
profile: './profile/profile_bundle.js',
protected_branches: './protected_branches/protected_branches_bundle.js',
snippet: './snippet/snippet_bundle.js',