Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

2 files changed, 24 insertions, 11 deletions

diff --git a/app/models/concerns/enums/data_visualization_palette.rb b/app/models/concerns/enums/data_visualization_palette.rb
index 25002e64ba6..6e712e79915 100644
--- a/app/models/concerns/enums/data_visualization_palette.rb
+++ b/app/models/concerns/enums/data_visualization_palette.rb
@@ -16,17 +16,17 @@ module Enums
 
     def self.weights
       {
-        '50'  =>  0,
-        '100' =>  1,
-        '200' =>  2,
-        '300' =>  3,
-        '400' =>  4,
-        '500' =>  5,
-        '600' =>  6,
-        '700' =>  7,
-        '800' =>  8,
-        '900' =>  9,
-        '950' =>  10
+        '50' => 0,
+        '100' => 1,
+        '200' => 2,
+        '300' => 3,
+        '400' => 4,
+        '500' => 5,
+        '600' => 6,
+        '700' => 7,
+        '800' => 8,
+        '900' => 9,
+        '950' => 10
       }
     end
   end
diff --git a/app/models/concerns/enums/sbom.rb b/app/models/concerns/enums/sbom.rb
new file mode 100644
index 00000000000..518efa669ad
--- /dev/null
+++ b/app/models/concerns/enums/sbom.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Enums
+  class Sbom
+    COMPONENT_TYPES = {
+      library: 0
+    }.with_indifferent_access.freeze
+
+    def self.component_types
+      COMPONENT_TYPES
+    end
+  end
+end