Merge branch 'master' into glitch-soc/merge-upstream

2019-08-06 13:16:53 +02:00
parent 3ea7a334d8 1d8d553d8b
commit cad2e6eb7a
39 changed files with 384 additions and 296 deletions
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -109,5 +109,5 @@
      %ul
        - @trending_hashtags.each do |tag|
          %li
-            = link_to "##{tag.name}", web_url("timelines/tag/#{tag.name}")
+            = link_to content_tag(:span, "##{tag.name}", class: !tag.trendable? && !tag.reviewed? ? 'warning-hint' : (!tag.trendable? ? 'negative-hint' : nil)), admin_tag_path(tag.id)
            %span.pull-right= number_with_delimiter(tag.history[0][:accounts].to_i)