diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-11 11:57:07 +0000 |
|---|---|---|
| committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-11 11:57:07 +0000 |
| commit | 8a1441fb025bf9f46d42017e069382a44ade28d0 (patch) | |
| tree | e5034235c53b6db61994c645c76a2708962cb05c /package.json | |
| parent | 5e95296278a629df317d769ae70a3bb9513a64cd (diff) | |
| parent | e4725a50e3c39b55eddbce3a573456ac6323473f (diff) | |
| download | gitlab-ce-8a1441fb025bf9f46d42017e069382a44ade28d0.tar.gz | |
Merge branch 'clean-javascript-vendor-files' into 'master'
Convert some vendored javascript assets to npm modules
See merge request !8990
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/package.json b/package.json index 249c69f586a..24e11a4607f 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,12 @@ "jquery": "2.2.1", "jquery-ui": "github:jquery/jquery-ui#1.11.4", "jquery-ujs": "1.2.1", + "js-cookie": "^2.1.3", "mousetrap": "1.4.6", "pikaday": "^1.5.1", "select2": "3.5.2-browserify", "stats-webpack-plugin": "^0.4.3", + "timeago.js": "^2.0.5", "underscore": "1.8.3", "vue": "2.0.3", "vue-resource": "0.9.3", |