From a90b36918f026dd291bef09f66fe8c212fe7984a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 20 May 2016 09:04:31 -0700 Subject: Add "The Bootstrap Authors" to copyright notices (#19936) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ❤️❤️❤️ https://github.com/twbs/bootstrap/graphs/contributors --- Gruntfile.js | 1 + 1 file changed, 1 insertion(+) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index fb7753170..4b350e264 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,6 +1,7 @@ /*! * Bootstrap's Gruntfile * http://getbootstrap.com + * Copyright 2013-2016 The Bootstrap Authors * Copyright 2013-2016 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -- cgit v1.2.3 From f77d8c91a9c9f53b30535016c72e821f047cd924 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 30 May 2016 22:14:18 -0700 Subject: Killed the grunt-eslint middleman; Long live ESLint. Refs #19908 [skip sauce] [skip validator] --- Gruntfile.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 4b350e264..b2f702e4e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -107,13 +107,6 @@ module.exports = function (grunt) { } }, - eslint: { - options: { - configFile: 'js/.eslintrc' - }, - target: 'js/src/*.js' - }, - jscs: { options: { config: 'js/.jscsrc' @@ -438,7 +431,7 @@ module.exports = function (grunt) { testSubtasks.push('saucelabs-qunit'); } grunt.registerTask('test', testSubtasks); - grunt.registerTask('test-js', ['eslint', 'jscs:core', 'jscs:test', 'jscs:grunt', 'qunit']); + grunt.registerTask('test-js', ['jscs:core', 'jscs:test', 'jscs:grunt', 'qunit']); // JS distribution task. grunt.registerTask('dist-js', ['babel:dev', 'concat', 'babel:dist', 'stamp', 'uglify:core', 'commonjs']); -- cgit v1.2.3