Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-04-06 21:47:46 +0300
committerJacob Schatz <jschatz1@gmail.com>2017-04-07 02:22:33 +0300
commit5c7953fb82c8982d0928892812e55711cab2e11c (patch)
tree2430dcc262882608223a8b3c27e10705c523a363
parent087e83287f749b7d78230c1c535dc58b836a32a4 (diff)
Leave icon area blank if legacy note; remove diamond icon
-rw-r--r--app/helpers/system_note_helper.rb4
-rw-r--r--app/views/shared/icons/_icon_diamond.svg1
2 files changed, 1 insertions, 4 deletions
diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb
index 7882c4f71a3..dcf5a301750 100644
--- a/app/helpers/system_note_helper.rb
+++ b/app/helpers/system_note_helper.rb
@@ -37,10 +37,8 @@ module SystemNoteHelper
'icon_comment_o'
when 'moved'
'icon_arrow-circle-o-right'
- else
- 'icon_diamond'
end
- custom_icon(icon_name)
+ custom_icon(icon_name) if icon_name
end
end
diff --git a/app/views/shared/icons/_icon_diamond.svg b/app/views/shared/icons/_icon_diamond.svg
deleted file mode 100644
index 4326b48da20..00000000000
--- a/app/views/shared/icons/_icon_diamond.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M84 768l623 665-300-665h-323zm812 772l349-772h-698zm-486-900l204-384h-262l-288 384h346zm675 793l623-665h-323zm-530-793h682l-204-384h-274zm827 0h346l-288-384h-262zm141-486l384 512q14 18 13 41.5t-17 40.5l-960 1024q-18 20-47 20t-47-20l-960-1024q-16-17-17-40.5t13-41.5l384-512q18-26 51-26h1152q33 0 51 26z"/></svg>