diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2017-05-02 13:20:41 -0500 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-05-02 13:20:41 -0500 |
| commit | bbfbcebdf69261bac6aa142f430719955e8e86b9 (patch) | |
| tree | 25916a1a761cb6c8fcdac4b20b76017a7f4506d3 /package.json | |
| parent | 3b82444eb7791e58e3e0ba2f08b8ccde48e3d4c6 (diff) | |
| parent | 920d55b9f8afd35e16351fb57d671acf66092e89 (diff) | |
| download | gitlab-ce-bbfbcebdf69261bac6aa142f430719955e8e86b9.tar.gz | |
Merge branch 'master' into 28433-internationalise-cycle-analytics-page
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/package.json b/package.json index 5cb07ddc3b7..63b2c190269 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,11 @@ "js-cookie": "^2.1.3", "jszip": "^3.1.3", "jszip-utils": "^0.0.2", + "marked": "^0.3.6", "mousetrap": "^1.4.6", + "pdfjs-dist": "^1.8.252", "pikaday": "^1.5.1", + "prismjs": "^1.6.0", "raphael": "^2.2.7", "raw-loader": "^0.5.1", "react-dev-utils": "^0.5.2", @@ -46,6 +49,7 @@ "three-stl-loader": "^1.0.4", "timeago.js": "^2.0.5", "underscore": "^1.8.3", + "url-loader": "^0.5.8", "visibilityjs": "^1.2.4", "vue": "^2.2.6", "vue-loader": "^11.3.4", @@ -62,6 +66,7 @@ "eslint-plugin-filenames": "^1.1.0", "eslint-plugin-import": "^2.2.0", "eslint-plugin-jasmine": "^2.1.0", + "eslint-plugin-promise": "^3.5.0", "istanbul": "^0.4.5", "jasmine-core": "^2.5.2", "jasmine-jquery": "^2.1.1", |