From 43b97a59c370ed07e01f568c6458dd8f72eab1f7 Mon Sep 17 00:00:00 2001
From: Greg Myers <neonmd@hotmail.co.uk>
Date: Sat, 27 Jul 2019 17:21:51 +0100
Subject: [PATCH] Prep for 2.6 (#1006)

---
 CHANGELOG.md               | 15 +++++++++++++++
 VERSIONS.md                |  1 +
 lib/react/rails/version.rb |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd83e1c07..766cb8ba8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,21 @@
 
 #### Bug Fixes
 
+## 2.6.0
+
+#### Breaking Changes
+
+#### New Features
+
+- Typescript component generator #990
+
+#### Deprecation
+
+#### Bug Fixes
+
+- assert_react_component will not pass tests where the case was different #979
+- action_controller/test_case was accidentally `required` in dev #996
+
 ## 2.5.0
 
 #### Breaking Changes
diff --git a/VERSIONS.md b/VERSIONS.md
index 9780627e9..6d27c5922 100644
--- a/VERSIONS.md
+++ b/VERSIONS.md
@@ -10,6 +10,7 @@ You can control what version of React.js (and JSXTransformer) is used by `react-
 | Gem      | React.js |
 |----------|----------|
 | master   | 16.8.6   |
+| 2.6.0    | 16.8.6   |
 | 2.5.0    | 16.8.6   |
 | 2.4.7    | 16.4.2   |
 | 2.4.6    | 16.4.1   |
diff --git a/lib/react/rails/version.rb b/lib/react/rails/version.rb
index 306fa8590..7a8f156b0 100644
--- a/lib/react/rails/version.rb
+++ b/lib/react/rails/version.rb
@@ -2,6 +2,6 @@ module React
   module Rails
     # If you change this, make sure to update VERSIONS.md
     # and republish the UJS by updating package.json and `bundle exec rake ujs:publish`
-    VERSION = '2.5.0'
+    VERSION = '2.6.0'
   end
 end