Merge branch '4-stable' into early-2x

octokit · Jul 1, 2022 · f9bf82b · f9bf82b
2 parents 1a3de39 + 97ac5fb
commit f9bf82b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/octokit/default.rb b/lib/octokit/default.rb
@@ -35,8 +35,7 @@ module Default
       # so we use it only when it's available.
       if defined?(Faraday::Request::Retry)
         builder.use Faraday::Request::Retry, exceptions: [Octokit::ServerError]
-      end
-      if defined?(Faraday::Retry::Middleware)
+      elsif defined?(Faraday::Retry::Middleware)
         builder.use Faraday::Retry::Middleware, exceptions: [Octokit::ServerError]
       end
 

diff --git a/lib/octokit/version.rb b/lib/octokit/version.rb
@@ -11,7 +11,7 @@ module Octokit
 
   # Current patch level.
   # @return [Integer]
-  PATCH = 0
+  PATCH = 1
 
   # Full release version.
   # @return [String]