From 83d844750cbc0008d4ab90199d602bf750dfca51 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Sun, 6 Jan 2019 14:29:19 -0800
Subject: [PATCH] Build: Prepare 2.9.0 release, including authors and history
 update

Add various names to mailmap so that they don't result in
duplicate entries from grunt-authors, using the existing entries
as canonical to make only the smallest change to AUTHORS.txt.

Closes #1363.
---
 .mailmap     |  4 ++++
 AUTHORS.txt  |  2 +-
 History.md   | 10 ++++++++++
 package.json |  2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 03fc2a412..7b71c756e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -91,3 +91,7 @@ Dave K. Smith <dave.k.smith@gmail.com>
 David Vollbracht <david.vollbracht@gmail.com>
 Jochen Ulrich <jochenulrich@t-online.de>
 Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
+Leonardo Balter <leonardo.balter@gmail.com>
+Kevin Partington <kevin.partington@kernelpanicstudios.com>
+Kevin Partington <kevin.partington@kernelpanicstudios.com> <platinum.azure@kernelpanicstudios.com>
+Manoj Kumar <manoj@kumarmj.me> <nithmanoj@gmail.com>
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 92c646853..0e38f8047 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -128,8 +128,8 @@ Daniel De Jager <danielmiester@gmail.com>
 Brahim Arkni <brahim.arkni@gmail.com>
 Cory Forsyth <cory.forsyth@gmail.com>
 Ed <proteenx11@gmail.com>
-yagni <yagni@users.noreply.github.com>
 Manoj Kumar <manoj@kumarmj.me>
+yagni <yagni@users.noreply.github.com>
 Tobias Oetzel <tobias.oetzel@sap.com>
 Ray Tiley <raytiley@gmail.com>
 Dustin Specker <dustinspecker@dustinspecker.com>
diff --git a/History.md b/History.md
index 9c536ef5b..0261166e4 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,13 @@
+2.9.0 / 2019-01-06
+==================
+
+  * Assert: Report RegExp/Error as strings from `rejects()`/`throws()` (#1333)
+  * Build: Add macOS and Windows to the Travis CI test matrix
+  * Build: Update engine requirement package.json to Node 6
+  * CLI: Reduce size of the dependencies tree (#1342)
+  * CLI: Re-implement run.watch() with 'node-watch' instead of 'sane' (#1342)
+  * HTML Reporter: Fix an unescaped details.source (#1341)
+
 2.8.0 / 2018-11-02
 ==================
 
diff --git a/package.json b/package.json
index 42b7e34ed..66c792a44 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "qunit",
   "title": "QUnit",
   "description": "An easy-to-use JavaScript Unit Testing framework.",
-  "version": "2.8.1-pre",
+  "version": "2.9.0-pre",
   "homepage": "https://qunitjs.com",
   "author": {
     "name": "jQuery Foundation and other contributors",