Merge branch 't/16801' into major

Author: Comandeer

.jscsrc

@@ -53,6 +53,6 @@
 	},
 	"validateIndentation": {
 		"value": "\t",
-		"allExcept": [ "comments" ]
+		"allExcept": [ "comments", "emptyLines" ]
 	}
-}
+}

.jshintrc

@@ -22,4 +22,4 @@
 	"validthis": true,
 
 	"predef": [ "CKEDITOR", "assert", "arrayAssert", "bender", "JSON", "objectAssert", "resume", "sinon", "wait", "YUITest" ]
-}
+}

README.md

@@ -1,6 +1,6 @@
 # CKEditor 4 - The best browser-based WYSIWYG editor
 
-[![devDependency Status](https://david-dm.org/ckeditor/ckeditor-dev/dev-status.svg)](https://david-dm.org/ckeditor/ckeditor-dev#info=devDependencies)
+[![devDependencies Status](https://david-dm.org/ckeditor/ckeditor-dev/dev-status.svg)](https://david-dm.org/ckeditor/ckeditor-dev?type=dev)
 
 This repository contains the development version of CKEditor.
 

dev/tasks/jscs.js

@@ -15,7 +15,7 @@ module.exports = function( grunt ) {
 			},
 
 			git: function() {
-				return tools.getGitDirtyFiles().filter( function( file ) {
+				return tools.getGitDirtyFiles( true ).filter( function( file ) {
 					return ( /\.js$/ ).test( file );
 				} );
 			}

dev/tasks/jshint.js

@@ -15,7 +15,7 @@ module.exports = function( grunt ) {
 			},
 
 			git: function() {
-				return tools.getGitDirtyFiles().filter( function( file ) {
+				return tools.getGitDirtyFiles( true ).filter( function( file ) {
 					return ( /\.js$/ ).test( file );
 				} );
 			}

dev/tasks/utils/tools.js

@@ -96,14 +96,15 @@ module.exports = {
 	/**
 	 * Gets the list of files that are supposed to be included in the next Git commit.
 	 *
+	 * @param cachedOnly {Boolean} List only files which are staged.
 	 * @returns {String[]} A list of file paths.
 	 */
-	getGitDirtyFiles: function() {
+	getGitDirtyFiles: function( cachedOnly ) {
 		// Cache it, so it is executed only once when running multiple tasks.
 		if ( !dirtyFiles ) {
 			dirtyFiles = this
 				// Compare the state of index with HEAD.
-				.shExec( 'git diff-index --name-only HEAD' )
+				.shExec( 'git diff-index --name-only ' + ( cachedOnly ? '--cached HEAD' : 'HEAD' ) )
 				// Remove trailing /n to avoid an empty entry.
 				.replace( /\s*$/, '' )
 				// Transform into array.
@@ -125,18 +126,15 @@ module.exports = {
 	 * @returns {String} The command output.
 	 */
 	shExec: function( command ) {
-		var sh = require( 'shelljs' );
-		sh.config.silent = true;
-
-		var ret = sh.exec( command );
+		var sh = require( 'shelljs' ),
+			ret = sh.exec( command, { silent: true } );
 
 		if ( ret.code ) {
 			throw new Error(
 				'Error while executing `' + command + '`:\n\n' +
-				ret.output
+				ret.stdout
 			);
 		}
-
-		return ret.output;
+		return ret.stdout;
 	}
 };

gruntfile.js

@@ -18,7 +18,8 @@ module.exports = function( grunt ) {
 		'samples/toolbarconfigurator/lib/**',
 		'tests/adapters/jquery/_assets/**',
 		'tests/core/dom/_assets/**',
-		'tests/core/selection/_helpers/rangy.js'
+		'tests/core/selection/_helpers/rangy.js',
+		'tests/plugins/pastefromword/generated/_lib/q.js'
 	];
 
 	// Basic configuration which will be overloaded by the tasks.

package.json

@@ -9,17 +9,17 @@
 		"benderjs-sinon": "^0.3.1",
 		"benderjs-yui": "^0.3.2",
     	"benderjs-yui-beautified": "0.0.5",
-		"grunt": "^0",
+		"grunt": "^1.0.1",
 		"grunt-contrib-imagemin": "^1.0.0",
-		"grunt-jscs": "^2.0.0",
+		"grunt-jscs": "^3.0.1",
 		"grunt-contrib-jshint": "^1.0.0",
 		"grunt-contrib-less": "^1.0.0",
 		"grunt-contrib-watch": "^1.0.0",
 		"grunt-contrib-concat": "^1.0.0",
 		"grunt-jsduck": "^1.0.1",
-		"grunt-githooks": "^0.5.0",
+		"grunt-githooks": "^0.6.0",
 		"less": "^2.5.0",
-		"shelljs": "~0.6",
+		"shelljs": "^0.7.6",
 		"cksource-samples-framework": "^1.0.1"
 	},
 	"scripts": {