1 files changed, 35 insertions, 10 deletions
diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb
index 99006308e..6afb84537 100644
--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
@@ -21,10 +21,10 @@ module IconsHelper
   DEFAULT_ICON_SIZE = "18"
   DEFAULT_SPRITE = "icons"
 
-  def sprite_icon(icon_name, label = nil, icon_only: false, size: DEFAULT_ICON_SIZE, css_class: nil, sprite: DEFAULT_SPRITE, plugin: nil)
+  def sprite_icon(icon_name, label = nil, icon_only: false, size: DEFAULT_ICON_SIZE, style: :outline, css_class: nil, sprite: DEFAULT_SPRITE, plugin: nil, rtl: false)
     sprite = plugin ? "plugin_assets/#{plugin}/#{sprite}.svg" : "#{sprite}.svg"
 
-    svg_icon = svg_sprite_icon(icon_name, size: size, css_class: css_class, sprite: sprite)
+    svg_icon = svg_sprite_icon(icon_name, size: size, style: style, css_class: css_class, sprite: sprite, rtl: rtl)
 
     if label
       label_classes = ["icon-label"]
@@ -36,23 +36,23 @@ module IconsHelper
     end
   end
 
-  def file_icon(entry, name, **options)
+  def file_icon(entry, name, **)
     if entry.is_dir?
-      sprite_icon("folder", name, **options)
+      sprite_icon("folder", name, **)
     else
       icon_name = icon_for_mime_type(Redmine::MimeType.css_class_of(name))
-      sprite_icon(icon_name, name, **options)
+      sprite_icon(icon_name, name, **)
     end
   end
 
-  def principal_icon(principal, **options)
+  def principal_icon(principal, **)
     raise ArgumentError, "First argument has to be a Principal, was #{principal.inspect}" unless principal.is_a?(Principal)
 
     principal_class = principal.class.name.downcase
-    sprite_icon('group', **options) if ['groupanonymous', 'groupnonmember', 'group'].include?(principal_class)
+    sprite_icon('group', **) if ['groupanonymous', 'groupnonmember', 'group'].include?(principal_class)
   end
 
-  def activity_event_type_icon(event_type, **options)
+  def activity_event_type_icon(event_type, **)
     icon_name = case event_type
                 when 'reply'
                   'comments'
@@ -64,14 +64,39 @@ module IconsHelper
                   event_type
                 end
 
-    sprite_icon(icon_name, **options)
+    sprite_icon(icon_name, **)
+  end
+
+  def scm_change_icon(action, name, **options)
+    icon_name = case action
+                when 'A'
+                  "add"
+                when 'D'
+                  "circle-minus"
+                else
+                  "circle-dot-filled"
+                end
+    sprite_icon(icon_name, name, size: 14)
+  end
+
+  def notice_icon(type, **)
+    icon_name = case type
+                when 'notice'
+                  'checked'
+                when 'warning', 'error'
+                  'warning'
+                end
+
+    sprite_icon(icon_name, **)
   end
 
   private
 
-  def svg_sprite_icon(icon_name, size: DEFAULT_ICON_SIZE, sprite: DEFAULT_SPRITE, css_class: nil)
+  def svg_sprite_icon(icon_name, size: DEFAULT_ICON_SIZE, style: :outline, sprite: DEFAULT_SPRITE, css_class: nil, rtl: false)
     css_classes = "s#{size} icon-svg"
+    css_classes += " icon-svg-filled" if style == :filled
     css_classes += " #{css_class}" unless css_class.nil?
+    css_classes += " icon-rtl" if rtl
 
     content_tag(
       :svg,