Merge branch '215913-allow-merge-denied-license-check' into 'master'

Allow merge when `License-Check` approve denied policies

See merge request gitlab-org/gitlab!35885

ee/app/models/ee/merge_request.rb

@@ -147,6 +147,8 @@ module EE
       return false if ::Feature.disabled?(:license_compliance_denies_mr, project, default_enabled: false)
       return false unless has_license_scanning_reports?
 
+      return false if has_approved_license_check?
+
       actual_head_pipeline.license_scanning_report.violates?(project.software_license_policies)
     end
 
@@ -241,6 +243,10 @@ module EE
 
     private
 
+    def has_approved_license_check?
+      approval_rules.license_compliance.last&.approvals_required == 0
+    end
+
     def missing_report_error(report_type)
       { status: :error, status_reason: "This merge request does not have #{report_type} reports" }
     end

ee/changelogs/unreleased/215913-allow-merge-denied-license-check.yml

+---
+title: Allow merge when `License-Check` approve denied policies
+merge_request: 35885
+author:
+type: added

ee/spec/models/merge_request_spec.rb

@@ -118,6 +118,20 @@ RSpec.describe MergeRequest do
 
             it { is_expected.to be_falsey }
           end
+
+          context 'with License-Check enabled' do
+            context 'when rule is not approved' do
+              let!(:license_check) { create(:report_approver_rule, :license_scanning, merge_request: merge_request, approvals_required: 1) }
+
+              it { is_expected.to be_truthy }
+            end
+
+            context 'when rule is approved' do
+              let!(:license_check) { create(:report_approver_rule, :license_scanning, merge_request: merge_request, approvals_required: 0) }
+
+              it { is_expected.to be_falsey }
+            end
+          end
         end
       end
     end