diff options
| author | Chris Rebert <[email protected]> | 2015-02-10 13:05:43 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-02-10 13:05:43 -0800 |
| commit | c8b0f59fbdc474b0e3cb48bff3b23f9c1793c5ae (patch) | |
| tree | b94b67eb3ebf00232888a6de132747886d410ff8 | |
| parent | 81115cd089c452b3a69bbbec39ffd4a70dda3b2d (diff) | |
| parent | de90cd7a80bf0d8eb23672ebe332ca295485efef (diff) | |
| download | bootstrap-c8b0f59fbdc474b0e3cb48bff3b23f9c1793c5ae.tar.xz bootstrap-c8b0f59fbdc474b0e3cb48bff3b23f9c1793c5ae.zip | |
Merge pull request #15784 from twbs/bump-grunt-html
Bump grunt-html to ~3.0.0
| -rw-r--r-- | Gruntfile.js | 1 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | test-infra/npm-shrinkwrap.json | 26 |
3 files changed, 14 insertions, 15 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 761e7089b..5539ee7ea 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -330,7 +330,6 @@ module.exports = function (grunt) { ignore: [ 'Attribute "autocomplete" not allowed on element "button" at this point.', 'Attribute "autocomplete" not allowed on element "input" at this point.', - 'Bad value "X-UA-Compatible" for attribute "http-equiv" on element "meta".', 'Element "img" is missing required attribute "src".' ] }, diff --git a/package.json b/package.json index aeb935f7f..db2ed2bc0 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "grunt-contrib-watch": "~0.6.1", "grunt-csscomb": "~3.0.0", "grunt-exec": "~0.4.6", - "grunt-html": "~2.0.0", + "grunt-html": "~3.0.0", "grunt-jekyll": "~0.4.2", "grunt-jscs": "~1.5.0", "grunt-saucelabs": "~8.5.0", diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json index 673899203..e118e0a1c 100644 --- a/test-infra/npm-shrinkwrap.json +++ b/test-infra/npm-shrinkwrap.json @@ -1972,8 +1972,8 @@ "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz" }, "semver": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.2.0.tgz" + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.2.2.tgz" }, "uid-number": { "version": "0.0.5", @@ -2486,8 +2486,8 @@ "resolved": "https://registry.npmjs.org/grunt-exec/-/grunt-exec-0.4.6.tgz" }, "grunt-html": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/grunt-html/-/grunt-html-2.0.0.tgz", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/grunt-html/-/grunt-html-3.0.0.tgz", "dependencies": { "async": { "version": "0.2.10", @@ -2532,8 +2532,8 @@ "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz" }, "jscs": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/jscs/-/jscs-1.11.1.tgz", + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/jscs/-/jscs-1.11.2.tgz", "dependencies": { "cli-table": { "version": "0.3.1", @@ -2744,12 +2744,12 @@ } }, "xmlbuilder": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.6.tgz", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.5.1.tgz", "dependencies": { - "lodash-node": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz" + "lodash": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz" } } } @@ -3936,8 +3936,8 @@ "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-2.0.0.tgz" }, "semver": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.2.0.tgz" + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.2.2.tgz" }, "sorted-object": { "version": "1.0.0", |