Merge pull request #508 from palantir/release-2.4

Release v2.4.0
palantir · Jul 20, 2015 · 7a08915 · 7a08915
2 parents 6b49be8 + ea6f6db
commit 7a08915
Show file tree

Hide file tree

Showing 10 changed files with 1,539 additions and 169 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Change Log
 ===
 
+v2.4.0
+---
+* Upgraded Typescript compiler to 1.5.3
+* [bugs] #332, #493, #509, #483
+* [bug] fix error message in `no-var-keyword` rule
+* [enhancement] CI tests are now run on node v0.12 in addition to v0.10
+
 v2.3.1-beta
 ---
 * [bugs] #137 #434 #451 #456
@@ -22,7 +29,7 @@ v2.3.0-beta
 
 v2.2.0-beta
 ---
-* Upgraded Typescript compiler to 1.5
+* Upgraded Typescript compiler to 1.5.0-beta
 * **BREAKING CHANGES**
 	* due to changes to the typescript compiler API, old custom rules may no longer work and may need to be rewritten
 	* the JSON formatter's line and character positions are now back to being 0-indexed instead of 1-indexed

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -167,6 +167,8 @@ module.exports = function (grunt) {
     grunt.registerTask("test", ["clean:test", "ts:test", "tslint:test", "concat:test", "mochaTest"]
                                   .concat(checkBinTest));
 
+    grunt.registerTask("concat-and-test", ["concat:test", "mochaTest"]);
+
     // create default task
     grunt.registerTask("default", ["jscs", "core", "bin", "test"]);
 };