aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2016-01-26 14:55:26 +0200
committerXhmikosR <[email protected]>2016-02-19 11:26:54 +0200
commitc6c2958385e38d573aee61cb117add738f1b3635 (patch)
tree77818e605e17f5d475a31171ea2a9c2c4afd90e6
parentdd47423ae6f9717b3d678b40e1ce8a8706301598 (diff)
downloadbootstrap-c6c2958385e38d573aee61cb117add738f1b3635.tar.xz
bootstrap-c6c2958385e38d573aee61cb117add738f1b3635.zip
Update grunt-html to v6.0.0.
Also remove the workaround for the old validator version. [skip sauce]
-rw-r--r--Gruntfile.js3
-rw-r--r--grunt/npm-shrinkwrap.json16
-rw-r--r--package.json2
3 files changed, 6 insertions, 15 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 31068766c..67cbc5078 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -327,8 +327,7 @@ module.exports = function (grunt) {
'The “datetime-local” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
'The “month” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
'The “time” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
- 'The “week” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
- 'Attribute “integrity” not allowed on element “script” at this point.' // Until https://github.com/jzaefferer/grunt-html/issues/86 gets fixed
+ 'The “week” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.'
]
},
src: ['_gh_pages/**/*.html', 'js/tests/visual/*.html']
diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json
index eb4c9acc1..85d08952f 100644
--- a/grunt/npm-shrinkwrap.json
+++ b/grunt/npm-shrinkwrap.json
@@ -1173,20 +1173,12 @@
"resolved": "https://registry.npmjs.org/grunt-exec/-/grunt-exec-0.4.6.tgz"
},
"grunt-html": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/grunt-html/-/grunt-html-5.0.1.tgz",
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/grunt-html/-/grunt-html-6.0.0.tgz",
"dependencies": {
"async": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/async/-/async-1.4.0.tgz"
- },
- "chalk": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.0.tgz"
- },
- "supports-color": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/async/-/async-1.5.1.tgz"
}
}
},
diff --git a/package.json b/package.json
index b2494c6e2..d02e6d6a6 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
"grunt-contrib-watch": "~0.6.1",
"grunt-eslint": "^17.1.0",
"grunt-exec": "~0.4.6",
- "grunt-html": "~5.0.0",
+ "grunt-html": "~6.0.0",
"grunt-jekyll": "~0.4.2",
"grunt-jscs": "~2.7.0",
"grunt-line-remover": "0.0.2",