From ae8ef1864c3a0705c9a3149ce0b3b6354bbcb2fe Mon Sep 17 00:00:00 2001
From: Philip Arndt <git@p.arndt.io>
Date: Mon, 13 Nov 2023 12:14:42 +1300
Subject: [PATCH 1/2] Upgrade Mocha in development dependencies (#1021)

Currently CI is failing because we refer to `MiniTest` and the class is
`Minitest`. This is also something that Mocha is doing, which is one of
our development dependencies, but updating that fixes it.
---
 friendly_id.gemspec | 2 +-
 test/helper.rb      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/friendly_id.gemspec b/friendly_id.gemspec
index e261b6b9..05d99e75 100644
--- a/friendly_id.gemspec
+++ b/friendly_id.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "coveralls"
   s.add_development_dependency "railties", ">= 4.0"
   s.add_development_dependency "minitest", "~> 5.3"
-  s.add_development_dependency "mocha", "~> 1.1"
+  s.add_development_dependency "mocha", "~> 2.1"
   s.add_development_dependency "yard"
   s.add_development_dependency "i18n"
   s.add_development_dependency "ffaker"
diff --git a/test/helper.rb b/test/helper.rb
index 0f7a40b6..5ee359c1 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -19,9 +19,9 @@
 end
 
 begin
-  TestCaseClass = MiniTest::Test
+  TestCaseClass = Minitest::Test
 rescue NameError
-  TestCaseClass = MiniTest::Unit::TestCase
+  TestCaseClass = Minitest::Unit::TestCase
 end
 
 require "mocha/minitest"

From ecfe968d60cd43ed8dc75187e5011f6eda85bce1 Mon Sep 17 00:00:00 2001
From: Philip Arndt <git@p.arndt.io>
Date: Mon, 13 Nov 2023 12:18:03 +1300
Subject: [PATCH 2/2] Release version 5.5.1

---
 Changelog.md               | 4 ++++
 lib/friendly_id/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 2c67702f..29217b45 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,10 @@ suggestions, ideas and improvements to FriendlyId.
 
 ## Unreleased
 
+## 5.5.1 (2023-11-13)
+
+* Fix YARD doc generation. ([#1006](https://github.com/norman/friendly_id/pull/1006))
+
 ## 5.5.0 (2022-11-16)
 
 * SimpleI18n: Handle regional locales ([#965](https://github.com/norman/friendly_id/pull/965))
diff --git a/lib/friendly_id/version.rb b/lib/friendly_id/version.rb
index 926e1beb..0d7d2bc0 100644
--- a/lib/friendly_id/version.rb
+++ b/lib/friendly_id/version.rb
@@ -1,3 +1,3 @@
 module FriendlyId
-  VERSION = "5.5.0".freeze
+  VERSION = "5.5.1".freeze
 end