Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

2 files changed, 20 insertions, 0 deletions

diff --git a/app/models/concerns/enums/abuse/category.rb b/app/models/concerns/enums/abuse/category.rb
new file mode 100644
index 00000000000..e024ed17e32
--- /dev/null
+++ b/app/models/concerns/enums/abuse/category.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Enums
+  module Abuse
+    module Category
+      def self.categories
+        {
+          spam: 0,  # spamcheck
+          virus: 1, # VirusTotal
+          fraud: 2, # Arkos, Telesign
+          ci_cd: 3  # PVS
+        }
+      end
+    end
+  end
+end
diff --git a/app/models/concerns/enums/ci/pipeline.rb b/app/models/concerns/enums/ci/pipeline.rb
index 778471eac8b..d798a13741f 100644
--- a/app/models/concerns/enums/ci/pipeline.rb
+++ b/app/models/concerns/enums/ci/pipeline.rb
@@ -69,6 +69,10 @@ module Enums
         ci_sources.merge(sources.slice(:parent_pipeline))
       end
 
+      def self.ci_and_security_orchestration_sources
+        ci_sources.merge(sources.slice(:security_orchestration_policy))
+      end
+
       # Returns the `Hash` to use for creating the `config_sources` enum for
       # `Ci::Pipeline`.
       def self.config_sources