danger 6.0.3 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ed2cdc61eed91524dbc037cc0b4109298a59f79bae857ab9ab4fb91f9f16d17
-  data.tar.gz: 59ddea79d36ee0dca6664f1ed3ce654e88bebfb70ed9f43ed5948d7bee11349f
+  metadata.gz: 0d07cd853986d22b15d4aed8699bd1877b506990221ccfd111dda79f004a4941
+  data.tar.gz: a5eff46697b1974fe5356a5276ee2913532732c6de08ab88d98eaedbb0131681
 SHA512:
-  metadata.gz: 1ed19550308a3957a370beab7524037eec4760f4c08664c7f4283ca647b2c10a909a9cf7aab934dd65b9ff518cb7f72d2ce51b2c1f4703c2c6b7fd1f061dd1b6
-  data.tar.gz: 99784fe747487d86ccbe6e65ac320ac5fbdcfab8818128f4c453c1161a7517b738f7611da988e1825e61d7613b96f946d412e8ea0ba71cf80c38cd784adfdac5
+  metadata.gz: f61272da6dbafad0f462d30567616125bdb31363ead8421b54c4fe302708848af0f90288a877a9213933b9db53c7eb8c11148da5300024e234983ae924de9d94
+  data.tar.gz: eeb94d72d083a0819a30f5af3029c8dbae5cede42fb5b166775f3100230756952e5147f250abed70269a75aaa81b21172fb6b5c325356f810a5b3678fc24fef3

data/lib/danger/ci_source/cirrus.rb

@@ -2,12 +2,10 @@ require "danger/request_sources/github/github"
 
 module Danger
   # ### CI Setup
-  # You need to edit your `.cirrus.yml` to include `bundle exec danger`.
+  # You need to edit your `.cirrus.yml` to include `bundler exec danger`.
   #
   # Adding this to your `.cirrus.yml` allows Danger to fail your build, both on the Cirrus CI website and within your Pull Request.
-  # With that set up, you can edit your job to add `bundle exec danger` at the build action.
-  #
-  # ### Token Setup
+  # With that set up, you can edit your task to add `bundler exec danger` in any script instruction.
   class Cirrus < CI
     def self.validates_as_ci?(env)
       env.key? "CIRRUS_CI"
@@ -25,7 +23,7 @@ module Danger
     def initialize(env)
       self.repo_slug = env["CIRRUS_REPO_FULL_NAME"]
       if env["CIRRUS_PR"].to_i > 0
-        self.pull_request_id = env["CIRRUS_BUILD_ID"]
+        self.pull_request_id = env["CIRRUS_PR"]
       end
       self.repo_url = env["CIRRUS_GIT_CLONE_URL"]
     end

data/lib/danger/ci_source/gitlab_ci.rb

@@ -39,11 +39,16 @@ module Danger
       base_commit = env["CI_COMMIT_SHA"]
       client = RequestSources::GitLab.new(nil, env).client
 
-      merge_requests = client.merge_requests(project_path, state: :opened)
-      merge_request = merge_requests.auto_paginate.find do |mr|
-        mr.sha == base_commit
+      if (Gem::Version.new(client.version.version) >= Gem::Version.new("10.7"))
+        #Use the 'list merge requests associated with a commit' API, for speeed
+        # (GET /projects/:id/repository/commits/:sha/merge_requests) available for GitLab >= 10.7
+        merge_request = client.commit_merge_requests(project_path, base_commit, state: :opened).first
+      else
+        merge_requests = client.merge_requests(project_path, state: :opened)
+        merge_request = merge_requests.auto_paginate.find do |mr|
+          mr.sha == base_commit
+        end
       end
-
       merge_request.nil? ? 0 : merge_request.iid
     end
 

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "6.0.3".freeze
+  VERSION = "6.0.4".freeze
   DESCRIPTION = "Like Unit Tests, but for your Team Culture.".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.0.4
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-05 00:00:00.000000000 Z
+date: 2019-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide