diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-26 11:26:10 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-26 11:26:10 +0000 |
| commit | c3633db6176a3e72903601400a965fc8c44a2cb1 (patch) | |
| tree | 16779d3e748b3e089d5e74663a70d6fe9d1b1d37 /package.json | |
| parent | 0453d6d7ae72f0179d02ff5190122a86e304e1bb (diff) | |
| parent | f00bb1c29ea438be66b3766545a57b468ade37d4 (diff) | |
| download | gitlab-ce-c3633db6176a3e72903601400a965fc8c44a2cb1.tar.gz | |
Merge branch 'master' into 'balsalmiq-support'
# 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 20a02c18789..e9964b8b638 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", "raw-loader": "^0.5.1", "react-dev-utils": "^0.5.2", @@ -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", |