diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-26 11:13:42 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-26 11:13:42 +0000 |
| commit | ca6cc6014eed02b2e74bc8ffe65d3c1cc2e511b4 (patch) | |
| tree | 2c7f9b643463a69b5010b8942eaa2e3c58fd59c9 /package.json | |
| parent | af6e3e57e4c0ee861e26310c65be2e5e8547ca68 (diff) | |
| parent | 52bd4b88dc557f0b3c63e82d0f2093f22b28ae9d (diff) | |
| download | gitlab-ce-ca6cc6014eed02b2e74bc8ffe65d3c1cc2e511b4.tar.gz | |
Merge branch 'master' into 'add-sentry-js-again-with-vue'
# Conflicts:
# config/webpack.config.js
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/package.json b/package.json index 4ac1526bba1..9d2312163dd 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,10 @@ "js-cookie": "^2.1.3", "jszip": "^3.1.3", "jszip-utils": "^0.0.2", + "marked": "^0.3.6", "mousetrap": "^1.4.6", "pikaday": "^1.5.1", + "prismjs": "^1.6.0", "raphael": "^2.2.7", "raven-js": "^3.14.0", "raw-loader": "^0.5.1", @@ -61,6 +63,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", |