Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

2 files changed, 9 insertions, 9 deletions

diff --git a/app/components/diffs/stats_component.rb b/app/components/diffs/stats_component.rb
index 74788133aa2..407c3ca4e58 100644
--- a/app/components/diffs/stats_component.rb
+++ b/app/components/diffs/stats_component.rb
@@ -14,14 +14,14 @@ module Diffs
     def diff_files_data
       diffs_map = @diff_files.map do |f|
         {
-            href: "##{helpers.hexdigest(f.file_path)}",
-            title: f.new_path,
-            name: f.file_path,
-            path: diff_file_path_text(f),
-            icon: diff_file_changed_icon(f),
-            iconColor: "#{diff_file_changed_icon_color(f)}",
-            added: f.added_lines,
-            removed: f.removed_lines
+          href: "##{helpers.hexdigest(f.file_path)}",
+          title: f.new_path,
+          name: f.file_path,
+          path: diff_file_path_text(f),
+          icon: diff_file_changed_icon(f),
+          iconColor: diff_file_changed_icon_color(f).to_s,
+          added: f.added_lines,
+          removed: f.removed_lines
         }
       end
 
diff --git a/app/components/pajamas/button_component.rb b/app/components/pajamas/button_component.rb
index b2dd798b718..cdfd201bfb8 100644
--- a/app/components/pajamas/button_component.rb
+++ b/app/components/pajamas/button_component.rb
@@ -65,7 +65,7 @@ module Pajamas
       classes.push(VARIANT_CLASSES[@variant])
 
       unless NON_CATEGORY_VARIANTS.include?(@variant) || @category == :primary
-        classes.push(VARIANT_CLASSES[@variant] + '-' + CATEGORY_CLASSES[@category])
+        classes.push("#{VARIANT_CLASSES[@variant]}-#{CATEGORY_CLASSES[@category]}")
       end
 
       classes.push(@button_options[:class])