Commit 4372d499 authored by XhmikosR's avatar XhmikosR

Merge pull request #14458 from twbs/npm-deps

Update dev dependencies.
parents b1bb5736 ac132da7
...@@ -18,8 +18,8 @@ after_script: ...@@ -18,8 +18,8 @@ after_script:
- if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi - if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi
env: env:
global: global:
- JEKYLL_VERSION: 2.1.1 - JEKYLL_VERSION: 2.3.0
- ROUGE_VERSION: 1.6.1 - ROUGE_VERSION: 1.6.2
- SAUCE_USERNAME: bootstrap - SAUCE_USERNAME: bootstrap
- secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ=" - secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="
- secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY=" - secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY="
......
...@@ -66,7 +66,7 @@ Bootstrap's documentation, included in this repo in the root directory, is built ...@@ -66,7 +66,7 @@ Bootstrap's documentation, included in this repo in the root directory, is built
### Running documentation locally ### Running documentation locally
1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.1.x). 1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.3.x).
- **Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems. - **Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems.
2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`. 2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`.
3. From the root `/bootstrap` directory, run `jekyll serve` in the command line. 3. From the root `/bootstrap` directory, run `jekyll serve` in the command line.
......
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
}, },
"devDependencies": { "devDependencies": {
"btoa": "~1.1.2", "btoa": "~1.1.2",
"glob": "~4.0.4", "glob": "~4.0.5",
"grunt": "~0.4.5", "grunt": "~0.4.5",
"grunt-autoprefixer": "~1.0.0", "grunt-autoprefixer": "~1.0.1",
"grunt-banner": "~0.2.3", "grunt-banner": "~0.2.3",
"grunt-contrib-clean": "~0.6.0", "grunt-contrib-clean": "~0.6.0",
"grunt-contrib-concat": "~0.5.0", "grunt-contrib-concat": "~0.5.0",
...@@ -43,21 +43,21 @@ ...@@ -43,21 +43,21 @@
"grunt-contrib-cssmin": "~0.10.0", "grunt-contrib-cssmin": "~0.10.0",
"grunt-contrib-jade": "~0.12.0", "grunt-contrib-jade": "~0.12.0",
"grunt-contrib-jshint": "~0.10.0", "grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-less": "~0.11.3", "grunt-contrib-less": "~0.11.4",
"grunt-contrib-qunit": "~0.5.2", "grunt-contrib-qunit": "~0.5.2",
"grunt-contrib-uglify": "~0.5.0", "grunt-contrib-uglify": "~0.5.1",
"grunt-contrib-watch": "~0.6.1", "grunt-contrib-watch": "~0.6.1",
"grunt-csscomb": "~3.0.0", "grunt-csscomb": "~3.0.0",
"grunt-exec": "~0.4.6", "grunt-exec": "~0.4.6",
"grunt-html-validation": "~0.1.18", "grunt-html-validation": "~0.1.18",
"grunt-jekyll": "~0.4.2", "grunt-jekyll": "~0.4.2",
"grunt-jscs": "~0.6.1", "grunt-jscs": "~0.6.2",
"grunt-saucelabs": "~8.2.0", "grunt-saucelabs": "~8.3.1",
"grunt-sed": "~0.1.1", "grunt-sed": "~0.1.1",
"load-grunt-tasks": "~0.6.0", "load-grunt-tasks": "~0.6.0",
"markdown": "~0.5.0", "markdown": "~0.5.0",
"npm-shrinkwrap": "~3.1.6", "npm-shrinkwrap": "~3.1.8",
"time-grunt": "~0.4.0" "time-grunt": "~1.0.0"
}, },
"engines": { "engines": {
"node": "~0.10.1" "node": "~0.10.1"
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment