From 3ba795552040e6b886618a998f64772e762a44da Mon Sep 17 00:00:00 2001
From: Koichi ITO <koic.ito@gmail.com>
Date: Mon, 8 Jun 2020 15:32:07 +0900
Subject: [PATCH] Cut 2.6.0

---
 CHANGELOG.md                 |  2 ++
 lib/rubocop/rails/version.rb |  2 +-
 relnotes/v2.6.0.md           | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 relnotes/v2.6.0.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3a4ffdd64..3510335253 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## master (unreleased)
 
+## 2.6.0 (2020-06-08)
+
 ### New features
 
 * [#51](https://github.com/rubocop-hq/rubocop-rails/issues/51): Add allowed receiver class names option for `Rails/DynamicFindBy`. ([@tejasbubane][])
diff --git a/lib/rubocop/rails/version.rb b/lib/rubocop/rails/version.rb
index d9448d6aeb..fd0a665158 100644
--- a/lib/rubocop/rails/version.rb
+++ b/lib/rubocop/rails/version.rb
@@ -4,7 +4,7 @@ module RuboCop
   module Rails
     # This module holds the RuboCop Rails version information.
     module Version
-      STRING = '2.5.2'
+      STRING = '2.6.0'
     end
   end
 end
diff --git a/relnotes/v2.6.0.md b/relnotes/v2.6.0.md
new file mode 100644
index 0000000000..a075509a1d
--- /dev/null
+++ b/relnotes/v2.6.0.md
@@ -0,0 +1,30 @@
+### New features
+
+* [#51](https://github.com/rubocop-hq/rubocop-rails/issues/51): Add allowed receiver class names option for `Rails/DynamicFindBy`. ([@tejasbubane][])
+* [#211](https://github.com/rubocop-hq/rubocop-rails/issues/211): Add autocorrect to `Rails/RakeEnvironment` cop. ([@tejasbubane][])
+* [#242](https://github.com/rubocop-hq/rubocop-rails/pull/242): Add `Rails/ContentTag` cop. ([@tabuchi0919][])
+* [#249](https://github.com/rubocop-hq/rubocop-rails/pull/249): Add new `Rails/Pick` cop. ([@eugeneius][])
+* [#257](https://github.com/rubocop-hq/rubocop-rails/pull/257): Add new `Rails/RedundantForeignKey` cop. ([@eugeneius][])
+
+### Bug fixes
+
+* [#12](https://github.com/rubocop-hq/rubocop-rails/issues/12): Fix a false positive for `Rails/SkipsModelValidations` when passing a boolean literal to `touch`. ([@eugeneius][])
+* [#238](https://github.com/rubocop-hq/rubocop-rails/issues/238): Fix auto correction for `Rails/IndexBy` when the `.to_h` invocation is separated in multiple lines. ([@diogoosorio][])
+* [#248](https://github.com/rubocop-hq/rubocop-rails/pull/248): Fix a false positive for `Rails/SaveBang` when `update` is called on `ENV`. ([@eugeneius][])
+* [#251](https://github.com/rubocop-hq/rubocop-rails/pull/251): Fix a false positive for `Rails/FilePath` when the result of `Rails.root.join` is interpolated at the end of a string. ([@eugeneius][])
+* [#91](https://github.com/rubocop-hq/rubocop-rails/issues/91): Fix `Rails/UniqBeforePluck` to not recommend using `uniq` in `ActiveRecord::Relation`s anymore since it was deprecated in Rails 5.0. ([@santib][], [@ghiculescu][])
+
+### Changes
+
+* [#233](https://github.com/rubocop-hq/rubocop-rails/pull/233): **(BREAKING)** Drop support for Ruby 2.3. ([@koic][])
+* [#236](https://github.com/rubocop-hq/rubocop-rails/pull/236): **(BREAKING)** Drop support for Rails 4.1 or lower. ([@koic][])
+* [#210](https://github.com/rubocop-hq/rubocop-rails/issues/210): Accept `redirecto_to(...) and return` and similar cases. ([@koic][])
+* [#258](https://github.com/rubocop-hq/rubocop-rails/pull/258): Drop support for RuboCop 0.81 or lower. ([@koic][])
+
+[@tejasbubane]: https://github.com/tejasbubane
+[@tabuchi0919]: https://github.com/tabuchi0919
+[@eugeneius]: https://github.com/eugeneius
+[@diogoosorio]: https://github.com/diogoosorio
+[@santib]: https://github.com/santib
+[@ghiculescu]: https://github.com/ghiculescu
+[@koic]: https://github.com/koic