dependabot-common 0.97.2 → 0.97.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 400377836ff3b569608132740fa427f0fbbfea100c2d51c937f5b629691830b2
-  data.tar.gz: ad54c7f57a344383e2753c69489652b583bdac3429cc79c15f46809ce8e70f09
+  metadata.gz: e9140696bdfbd5b096f0af13e14f823b63a727f47843ad755b0cc451e4a5d285
+  data.tar.gz: '00831f5ca91b7682dbe3e82700d27a9db8d46750d4abb3d8ab754d324064d65a'
 SHA512:
-  metadata.gz: b13c39e10ab6e5850a40280eb2cf689c3a1c975b86cb36fe328af1b5878f92eff68c6ac4acc6ab350a6744a41b6369355bc9ee7db84e48ce0b4efbf74736df1c
-  data.tar.gz: c67044e225e16b27eac480506915421a8d4f7dec937901ad3cef087272e5ad24079078ea024cbf92dc3915f5b5b8c96a05221a14d9e06aadd0d25f7225d84a77
+  metadata.gz: ffbcca4b1e8998e628f420cfe37ef5cdfd29b3b23ef6a7aeff99e17964502aa6615015900c6d4b70dad69ce74773e8227421fe1dbc0b342da14a9f0f0bbc4f50
+  data.tar.gz: 9082d967c8890ccc9a908299e63ddee3996b843f0ced26de7c9900c3df6677b8ba36a85c95a401abdc601eada2767790af46044fd67662a4c4f9aac07005db83

data/lib/dependabot/pull_request_creator/github.rb

@@ -239,6 +239,8 @@ module Dependabot
           pull_request.number,
           milestone: milestone
         )
+      rescue Octokit::UnprocessableEntity => error
+        raise unless error.message.include?("code: invalid")
       end
 
       def create_pull_request

data/lib/dependabot/shared_helpers.rb

@@ -166,9 +166,23 @@ module Dependabot
         "'!#{credential_helper_path} --file=#{Dir.pwd}/git.store'"
       )
 
+      github_credentials = credentials.
+                           select { |c| c["type"] == "git_source" }.
+                           select { |c| c["host"] == "github.com" }
+
+      # If multiple credentials are specified for github.com, pick the one that
+      # *isn't* just an app token (since it must have been added deliberately)
+      github_credential =
+        github_credentials.find { |c| !c["password"]&.start_with?("v1.") } ||
+        github_credentials.first
+
+      deduped_credentials = credentials -
+                            github_credentials +
+                            [github_credential].compact
+
       # Build the content for our credentials file
       git_store_content = ""
-      credentials.each do |cred|
+      deduped_credentials.each do |cred|
         next unless cred["type"] == "git_source"
 
         authenticated_url =

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.97.2
+  version: 0.97.3
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr