Merge branch 'norman:master' into master

norman · Nov 13, 2023 · 4f4e8d4 · 4f4e8d4
2 parents 7c09f01 + ecfe968
commit 4f4e8d4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git 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/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/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
diff --git 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"