danger 8.2.2 → 8.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 251a83485fbb01f15fb71afc1e76bed01879d166f6899407c2bee22416fa5ca7
-  data.tar.gz: 0fbbc7ce20a833a55e2be4b842e4e89d70a130038c0eec0408396892ceba215c
+  metadata.gz: cd811a6fad28534b9e0b28ccbed30d0694e4ab3408ad22852a8897a56c55f2ed
+  data.tar.gz: 747e7a6ff6fce272eb7b732ced8f6358602159725e5490a3ce783f7ce06dcc83
 SHA512:
-  metadata.gz: 9780c2dfd1a909732b7571c0141e74d35b92cbdcfbcfad48c2b2bc713dc62e062598301b0bca38a6759ef032ea4318a2d04e5b40d8d7fccb441b2f78f4a59862
-  data.tar.gz: 5f93607907d82ffc36c6f5074796dfdacfd2c6771390e4bda57405c3c0f1f1545506a7f03b95b536fec763313612f24f27f4c20e9b4e4603570e0ab1b7e6f572
+  metadata.gz: 54612a3b0e7999fce7289a884febff1548edbfa92af9947a8c8cc4bbef5fa69451ac88b493bc2ba0125e23ef96f7a46846a7a3b1e7adb8ac4d8f98aafa0065ce
+  data.tar.gz: 6612a1c511c7fe579c2734f6b4c8b15955dc2a2dd196a4a0277a901d61307b58c2abdd7f000867c1f212d2db065b39c8dfcd9f83c774154b1089a37395f45096

data/lib/danger/ci_source/gitlab_ci.rb

@@ -46,10 +46,17 @@ module Danger
       base_commit = env["CI_COMMIT_SHA"]
       client = RequestSources::GitLab.new(nil, env).client
 
-      if (Gem::Version.new(client.version.version) >= Gem::Version.new("10.7"))
+      client_version = Gem::Version.new(client.version.version)
+      if (client_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
+        if (client_version >= Gem::Version.new("13.8"))
+          # Gitlab 13.8.0 started returning merge requests for merge commits and squashed commits
+          # By checking for merge_request.state, we can ensure danger only comments on MRs which are open
+          return 0 if merge_request.nil?
+          return 0 unless merge_request.state == "opened"
+        end
       else
         merge_requests = client.merge_requests(project_path, state: :opened)
         merge_request = merge_requests.auto_paginate.find do |mr|

data/lib/danger/ci_source/support/commits.rb

@@ -1,17 +1,19 @@
-class Commits
-  def initialize(base_head)
-    @base_head = base_head.strip.split(" ".freeze)
-  end
+module Danger
+  class Commits
+    def initialize(base_head)
+      @base_head = base_head.strip.split(" ".freeze)
+    end
 
-  def base
-    base_head.first
-  end
+    def base
+      base_head.first
+    end
 
-  def head
-    base_head.last
-  end
+    def head
+      base_head.last
+    end
 
-  private
+    private
 
-  attr_reader :base_head
+    attr_reader :base_head
+  end
 end

data/lib/danger/commands/dangerfile/init.rb

@@ -4,7 +4,7 @@ require "danger/danger_core/dangerfile_generator"
 
 module Danger
   class DangerfileCommand < Runner
-    self.summary = "Easily create you Dangerfiles."
+    self.summary = "Easily create your Dangerfiles."
     self.command = "dangerfile"
 
     self.abstract_command = true

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "8.2.2".freeze
+  VERSION = "8.2.3".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: 8.2.2
+  version: 8.2.3
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -147,16 +147,22 @@ dependencies:
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: cork
   requirement: !ruby/object:Gem::Requirement