Add latest changes from gitlab-org/gitlab@master

3 files changed, 22 insertions, 14 deletions

diff --git a/app/models/merge_request/diff_llm_summary.rb b/app/models/merge_request/diff_llm_summary.rb
deleted file mode 100644
index e13fe5e1f50..00000000000
--- a/app/models/merge_request/diff_llm_summary.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# rubocop:disable Style/ClassAndModuleChildren
-# frozen_string_literal: true
-
-class MergeRequest::DiffLlmSummary < ApplicationRecord
-  belongs_to :merge_request_diff
-  belongs_to :user, optional: true
-
-  validates :merge_request_diff_id, uniqueness: true
-  validates :provider, presence: true
-  validates :content, presence: true, length: { maximum: 2056 }
-
-  enum provider: { openai: 0 }
-end
-# rubocop:enable Style/ClassAndModuleChildren
diff --git a/app/policies/merge_request_policy.rb b/app/policies/merge_request_policy.rb
index 49f9225a1d3..090be645b21 100644
--- a/app/policies/merge_request_policy.rb
+++ b/app/policies/merge_request_policy.rb
@@ -16,6 +16,10 @@ class MergeRequestPolicy < IssuablePolicy
     prevent :accept_merge_request
   end
 
+  rule { can?(:read_merge_request) }.policy do
+    enable :generate_diff_summary
+  end
+
   rule { can_approve }.policy do
     enable :approve_merge_request
   end
@@ -43,6 +47,10 @@ class MergeRequestPolicy < IssuablePolicy
     enable :set_merge_request_metadata
   end
 
+  rule { llm_bot }.policy do
+    enable :generate_diff_summary
+  end
+
   private
 
   def can_approve?
diff --git a/app/validators/json_schemas/scan_result_policy_vulnerability_attributes.json b/app/validators/json_schemas/scan_result_policy_vulnerability_attributes.json
new file mode 100644
index 00000000000..e0051179a1d
--- /dev/null
+++ b/app/validators/json_schemas/scan_result_policy_vulnerability_attributes.json
@@ -0,0 +1,14 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "description": "Scan result policy vulnerability_attributes",
+  "type": "object",
+  "properties": {
+    "false_positive": {
+      "type": "boolean"
+    },
+    "fix_available": {
+      "type": "boolean"
+    }
+  },
+  "additionalProperties": false
+}