Merge branch 'v4' into v4_builds

1 files changed, 6 insertions, 6 deletions

diff --git a/Gruntfile.js b/Gruntfile.js
index e33fc7c50..df7dfe45a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -205,11 +205,11 @@ module.exports = function (grunt) {
     // CSS build configuration
 
     scsslint: {
-      scss: ['scss/*.scss', '!scss/_normalize.scss'],
       options: {
-        config: 'scss/.scss-lint.yml',
-        reporterOutput: 'scss-lint-report.xml'
-      }
+        config: 'scss/.scsslint.yml',
+        reporterOutput: null
+      },
+      src: ['scss/*.scss', '!scss/_normalize.scss']
     },
 
     postcss: {
@@ -460,7 +460,7 @@ module.exports = function (grunt) {
   // JS distribution task.
   grunt.registerTask('dist-js', ['concat', 'lineremover', 'babel:dist', 'stamp', 'uglify:core', 'commonjs']);
 
-  grunt.registerTask('test-scss', ['scsslint:scss']);
+  grunt.registerTask('test-scss', ['scsslint']);
 
   // CSS distribution task.
   // Supported Compilers: sass (Ruby) and libsass.
@@ -498,7 +498,7 @@ module.exports = function (grunt) {
   grunt.registerTask('lint-docs-js', ['jscs:assets']);
   grunt.registerTask('docs', ['docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs']);
 
-  grunt.registerTask('docs-github', ['jekyll:github']);
+  grunt.registerTask('prep-release', ['dist', 'docs', 'jekyll:github', 'htmlmin', 'compress']);
 
   // Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json).
   // This task should be run and the updated file should be committed whenever Bootstrap's dependencies change.