dependabot-common 0.97.7 → 0.97.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb24d9fce860a57209ff001a5227d177038928aa41593b5d1de854e4b94ce953
-  data.tar.gz: 8caf8568036e80e07bb60348a351a43dd2b9f0d9b1e109d6812fa7e5ca8a209a
+  metadata.gz: 36e1077d9e56e99cf7e83979ce3b22b97a40c192addc540da8eb13198fc3337c
+  data.tar.gz: '09f313a956b5fdd549e6c9f83b5bc25dabb74a4352474e34e0bff34ca735eb8d'
 SHA512:
-  metadata.gz: f8382dd06584c50ae39d7a7f1aff981ee19e934b78418f25906dec52a1fc15ada648873d81fa4648456e6a45d1a2b6cfd2b6c37a1387f526149705d2c124dff4
-  data.tar.gz: 5ba273083c864b3a6d88158e88c842e4a278ada1ffe5c6d72c8e139251725ee57a51f259ad3e8da0b4584a533ae1e9b71ae8574f6f6ae670cf9f63b824ef5e63
+  metadata.gz: 139e060192dc9873eb0b9b741e09e569ac84c0d30ecc2490d816f84c12c514ca9f06e1b528b135ac245e2bea09b1b2d16893142b5e68e583fbc6ea86ad431fda
+  data.tar.gz: 2537b48ce72b669f98d84ac250e005032dd1e3b51a0aa8192c74a49150ca3a7a84b0cac51f1bdf3a56737e8416c7fefec29259a1f7a63ecbb8a193ff0d9c773e

data/lib/dependabot/pull_request_creator/message_builder.rb

@@ -836,10 +836,7 @@ module Dependabot
       end
 
       def recent_github_commit_messages
-        @recent_github_commit_messages ||=
-          github_client_for_source.commits(source.repo)
-
-        @recent_github_commit_messages.
+        recent_github_commits.
           reject { |c| c.author&.type == "Bot" }.
           reject { |c| c.commit&.message&.start_with?("Merge") }.
           map(&:commit).
@@ -869,10 +866,7 @@ module Dependabot
       end
 
       def last_github_dependabot_commit_message
-        @recent_github_commit_messages ||=
-          github_client_for_source.commits(source.repo)
-
-        @recent_github_commit_messages.
+        recent_github_commits.
           reject { |c| c.commit&.message&.start_with?("Merge") }.
           find { |c| c.commit.author&.name == "dependabot[bot]" }&.
           commit&.
@@ -880,6 +874,12 @@ module Dependabot
           strip
       end
 
+      def recent_github_commits
+        @recent_github_commits ||= github_client_for_source.commits(source.repo)
+      rescue Octokit::Conflict
+        @recent_github_commits ||= []
+      end
+
       def last_gitlab_dependabot_commit_message
         @recent_gitlab_commit_messages ||=
           gitlab_client_for_source.commits(source.repo)

data/lib/dependabot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.97.7"
+  VERSION = "0.97.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.97.7
+  version: 0.97.8
 platform: ruby
 authors:
 - Dependabot