From f0719d8bf73a5a128261bb06630bc160a2ec2c9b Mon Sep 17 00:00:00 2001
From: Edouard CHIN <chin.edouard@gmail.com>
Date: Fri, 1 Jul 2022 15:34:11 +0200
Subject: [PATCH 1/2] Remove duplicated Faraday::Retry::Middleware:

- ### Problem

  The Faraday::Retry::Middleware is added twice by Octokit when
  instantiating the Faraday::RackBuilder object.

  ```sh
  irb(main):001:0> Octokit.middleware
  =>
  #<Faraday::RackBuilder:0x0000000107898700
    @adapter=Faraday::Adapter::NetHttp,
    @handlers=
    [Faraday::Retry::Middleware,
    Faraday::Retry::Middleware,
    ...
  ```

  ### Context

  The latest Faraday version in the 1.x serie added an alias
  for `Faraday::Request::Retry`
  https://github.com/lostisland/faraday/blob/824423ccbb534d0b0553c3a0b3f2fbb9b0d84c60/lib/faraday.rb#L33

  ### Solution

  Use a elsif statement to avoid ending up with duplicated middleware
---
 lib/octokit/default.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/octokit/default.rb b/lib/octokit/default.rb
index bd5806037..822254323 100644
--- 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
 

From 97ac5fbfef3349a526963796af77ee43b52de853 Mon Sep 17 00:00:00 2001
From: Tim Rogers <me@timrogers.co.uk>
Date: Fri, 1 Jul 2022 14:55:45 +0100
Subject: [PATCH 2/2] v4.25.1

* Stop configuring Faraday's retry middleware twice (@Edouard-chin)
* Fix various Ruby warnings (e.g. missing parentheses) (@coryf)
---
 lib/octokit/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/octokit/version.rb b/lib/octokit/version.rb
index 996240e4d..146610911 100644
--- 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]