dependabot-common 0.111.46 → 0.111.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c9e3a603be24e3d105be3626c34a49f8c5ae84cf948bebec645c1f8eb195c87
-  data.tar.gz: ba7861847d4c45d7eed064fba9e41a1355a4a9b78259901804e56c7bd68a50a9
+  metadata.gz: a7794417aa757c3b3889e8e37458c43b1c537f920b8cc6bfcb729dbf39fd5ced
+  data.tar.gz: 2ca4fe1ddd33e9df4ef63e2f397e0d25e60bbd6df90c1e2473912c4327527e27
 SHA512:
-  metadata.gz: cd375d7c2e37d91a6ebe61e0aab30dc556812c8ab7df85d1525d83ad0a4f86a3b1e1e4cf9b42f9ca27feca03298e5f0b0044cd00eb82f4ec47b3d6a775bfe7ee
-  data.tar.gz: fcb281871a2eb6511b3a6664efd1173c605b9c6449f3313e9ae680e91d3740cca8138e6d533cc39d02d8a214f3d7211fc17788b5d0ce54f2439b145ad59f6b1a
+  metadata.gz: 9fcd973e9cc892bdbb6a59a65a6b177f6dbfa312ff447b12f35c27e06b59ffdc2894c73be91896aa297e87829ae156d99f6adf252e0ebc74d008ac48de2f8f44
+  data.tar.gz: 13b64f851e3f333cdd54f62bd52d88f5dbdf472eaea7263db276d1cb31f1465fd8f444f1d35e23eeeb2bdbb95f96e2e3a82d8f9a3dddf1b0feef8fea5d9b402e

data/lib/dependabot/pull_request_creator/github.rb

@@ -77,28 +77,35 @@ module Dependabot
         retry
       end
 
+      # Existing pull requests with this branch name that are open or closed.
+      # Note: we ignore *merged* pull requests for the branch name as we want
+      # to recreate them if the dependency version has regressed.
       def pull_request_exists?
-        github_client_for_source.pull_requests(
-          source.repo,
-          head: "#{source.repo.split('/').first}:#{branch_name}",
-          state: "all"
-        ).any?
-      rescue Octokit::InternalServerError
-        # A GitHub bug sometimes means adding `state: all` causes problems.
-        # In that case, fall back to making two separate requests.
-        open_prs = github_client_for_source.pull_requests(
-          source.repo,
-          head: "#{source.repo.split('/').first}:#{branch_name}",
-          state: "open"
-        )
-
-        closed_prs = github_client_for_source.pull_requests(
-          source.repo,
-          head: "#{source.repo.split('/').first}:#{branch_name}",
-          state: "closed"
-        )
+        pull_requests =
+          begin
+            github_client_for_source.pull_requests(
+              source.repo,
+              head: "#{source.repo.split('/').first}:#{branch_name}",
+              state: "all"
+            )
+          rescue Octokit::InternalServerError
+            # A GitHub bug sometimes means adding `state: all` causes problems.
+            # In that case, fall back to making two separate requests.
+            open_prs = github_client_for_source.pull_requests(
+              source.repo,
+              head: "#{source.repo.split('/').first}:#{branch_name}",
+              state: "open"
+            )
+
+            closed_prs = github_client_for_source.pull_requests(
+              source.repo,
+              head: "#{source.repo.split('/').first}:#{branch_name}",
+              state: "closed"
+            )
+            [*open_prs, *closed_prs]
+          end
 
-        [*open_prs, *closed_prs].any?
+        pull_requests.reject(&:merged).any?
       end
 
       def repo_exists?

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.111.46
+  version: 0.111.47
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-04 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr