lib/danger/ci_source/gitlab_ci.rb in danger-5.3.3 vs lib/danger/ci_source/gitlab_ci.rb in danger-5.3.4

@@ -2,32 +2,56 @@
 require "uri"
 require "danger/request_sources/gitlab"
 
 module Danger
   # ### CI Setup
-  # GitLab CI is currently not supported because GitLab's runners don't expose
-  # the required values in the environment. Namely CI_MERGE_REQUEST_ID does not
-  # exist as of yet, however there is an
-  # [MR](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5698) fixing this.
-  # If that has been merged and you are using either gitlab.com or a release
-  # with that change this CISource will work.
   #
+  # Install dependencies and add a danger step to your .gitlab-ci.yml:
+  # ``` yml
+  # before_script:
+  #  - bundle install
+  # danger:
+  #   script:
+  #    - bundle exec danger
+  # ```
+  # ### Token Setup
+  #
+  # Add the `DANGER_GITHUB_API_TOKEN` to your pipeline env variables.
   class GitLabCI < CI
     def self.validates_as_ci?(env)
       env.key? "GITLAB_CI"
     end
 
     def self.validates_as_pr?(env)
-      exists = ["CI_MERGE_REQUEST_ID", "CI_PROJECT_ID", "GITLAB_CI"].all? { |x| env[x] }
-      exists && env["CI_MERGE_REQUEST_ID"].to_i > 0
+      exists = [
+        "GITLAB_CI", "CI_PROJECT_ID"
+      ].all? { |x| env[x] }
+
+      exists && determine_merge_request_id(env).to_i > 0
     end
 
-    def supported_request_sources
-      @supported_request_sources ||= [Danger::RequestSources::GitLab]
+    def self.determine_merge_request_id(env)
+      return env["CI_MERGE_REQUEST_ID"] if env["CI_MERGE_REQUEST_ID"]
+      return 0 unless env["CI_COMMIT_SHA"]
+
+      project_id = env["CI_PROJECT_ID"]
+      base_commit = env["CI_COMMIT_SHA"]
+      client = RequestSources::GitLab.new(nil, env).client
+
+      merge_requests = client.merge_requests(project_id, state: :opened)
+      merge_request = merge_requests.auto_paginate.bsearch do |mr|
+        mr.sha == base_commit
+      end
+
+      merge_request.nil? ? 0 : merge_request.iid
     end
 
     def initialize(env)
       self.repo_slug = env["CI_PROJECT_ID"]
-      self.pull_request_id = env["CI_MERGE_REQUEST_ID"]
+      self.pull_request_id = self.class.determine_merge_request_id(env)
+    end
+
+    def supported_request_sources
+      @supported_request_sources ||= [Danger::RequestSources::GitLab]
     end
   end
 end