dependabot-common 0.180.0 → 0.180.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b9c5a80ab154885ed67b6b2eaae39a28c68228c3f6412dd8983b808ffc39261
-  data.tar.gz: 073dfe0016cba0a6dd41d908e0f76b130cb34f0595c8fccd34c31f6aca3d358a
+  metadata.gz: 0b4c1b2ea482de6dfe3ed2f5d528b9d955af8b8003a6b2ee0a525e7684bffb74
+  data.tar.gz: 5b3965c5bbb71869e057f04a20e561ba4ccef3b985133dfefb0ed48654d62d41
 SHA512:
-  metadata.gz: 3b4317440f509f2991f6dcd82f59727ee7c716a85856de394838ed362a0b18767855297acb9c30b2a312bb7ba8e374570e187034340252464831d8a69e551918
-  data.tar.gz: 9bdae5742d39d9501eca6ce904fbd9bd02068ebb85d4c7c50ed9b9f27462301b09f770a1fe978a47a9a2600cc6580b703b54bfdc1af7a41ce611deec1de13834
+  metadata.gz: ebc82fe32f383fea95e3ae56f56f6d49b3fef6d483e548db131a8a8f02a93bfbf804ab26121b38fe75384aad2d23f53ebefef510bd286c9a5433d88f37ef5522
+  data.tar.gz: 2a88f5f5c1c021e7607fbc43b9300ceba2b8f31a1126dfc2f15df60978190d532c7f14e5a615bf86b226e0f0bffd18d8d69903182a4807c5407c18550bbe9bcb

data/lib/dependabot/metadata_finders/base/changelog_finder.rb

@@ -271,6 +271,7 @@ module Dependabot
         end
 
         def fetch_gitlab_file_list
+          branch = default_gitlab_branch
           gitlab_client.repo_tree(source.repo).map do |file|
             type = case file.type
                    when "blob" then "file"
@@ -281,8 +282,8 @@ module Dependabot
               name: file.name,
               type: type,
               size: 100, # GitLab doesn't return file size
-              html_url: "#{source.url}/blob/master/#{file.path}",
-              download_url: "#{source.url}/raw/master/#{file.path}"
+              html_url: "#{source.url}/blob/#{branch}/#{file.path}",
+              download_url: "#{source.url}/raw/#{branch}/#{file.path}"
             )
           end
         rescue Gitlab::Error::NotFound
@@ -355,6 +356,11 @@ module Dependabot
           @default_bitbucket_branch ||=
             bitbucket_client.fetch_default_branch(source.repo)
         end
+
+        def default_gitlab_branch
+          @default_gitlab_branch ||=
+            gitlab_client.fetch_default_branch(source.repo)
+        end
       end
     end
   end

data/lib/dependabot/metadata_finders/base/commits_finder.rb

@@ -210,7 +210,7 @@ module Dependabot
           elsif new_tag
             "commits/#{new_tag}"
           else
-            "commits/master"
+            "commits/#{default_gitlab_branch}"
           end
         end
 
@@ -321,6 +321,11 @@ module Dependabot
           MetadataFinders::Base::PACKAGE_MANAGERS_WITH_RELIABLE_DIRECTORIES.
             include?(dependency.package_manager)
         end
+
+        def default_gitlab_branch
+          @default_gitlab_branch ||=
+            gitlab_client.fetch_default_branch(source.repo)
+        end
       end
     end
   end

data/lib/dependabot/pull_request_creator/gitlab.rb

@@ -145,26 +145,32 @@ module Dependabot
           assignee_ids: assignees,
           labels: labeler.labels_for_pr.join(","),
           milestone_id: milestone,
-          target_project_id: target_project_id
+          target_project_id: target_project_id,
+          reviewer_ids: approvers_hash[:reviewers]
         )
       end
 
       def annotate_merge_request(merge_request)
-        add_approvers_to_merge_request(merge_request) if approvers&.any?
+        add_approvers_to_merge_request(merge_request)
       end
 
       def add_approvers_to_merge_request(merge_request)
-        approvers_hash =
-          approvers.keys.map { |k| [k.to_sym, approvers[k]] }.to_h
+        return unless approvers_hash[:approvers] || approvers_hash[:group_approvers]
 
-        gitlab_client_for_source.edit_merge_request_approvers(
+        gitlab_client_for_source.create_merge_request_level_rule(
           target_project_id || source.repo,
           merge_request.iid,
-          approver_ids: approvers_hash[:approvers],
-          approver_group_ids: approvers_hash[:group_approvers]
+          name: "dependency-updates",
+          approvals_required: 1,
+          user_ids: approvers_hash[:approvers],
+          group_ids: approvers_hash[:group_approvers]
         )
       end
 
+      def approvers_hash
+        @approvers_hash ||= approvers&.transform_keys(&:to_sym) || {}
+      end
+
       def default_branch
         @default_branch ||=
           gitlab_client_for_source.project(source.repo).default_branch

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.180.0
+  version: 0.180.3
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,28 +132,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: gitlab
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.17.0
+        version: 4.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.17.0
+        version: 4.18.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -298,14 +298,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.26.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement