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

Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.

app/views/about/_domain_blocks.html.haml

@@ -6,5 +6,7 @@
   %tbody
     - domain_blocks.each do |domain_block|
       %tr
-        %td.nowrap= domain_block.domain
-        %td= domain_block.public_comment if display_blocks_rationale?
+        %td.nowrap
+          %span{ title: domain_block.domain }= domain_block.domain
+        %td
+          = domain_block.public_comment if display_blocks_rationale?

app/views/admin/tags/show.html.haml

@@ -11,9 +11,14 @@
       .dashboard__counters__num= number_with_delimiter @accounts_week
       .dashboard__counters__label= t 'admin.tags.accounts_week'
   %div
-    = link_to explore_hashtag_path(@tag) do
-      .dashboard__counters__num= number_with_delimiter @tag.accounts_count
-      .dashboard__counters__label= t 'admin.tags.directory'
+    - if @tag.accounts_count > 0
+      = link_to explore_hashtag_path(@tag) do
+        .dashboard__counters__num= number_with_delimiter @tag.accounts_count
+        .dashboard__counters__label= t 'admin.tags.directory'
+    - else
+      %div
+        .dashboard__counters__num= number_with_delimiter @tag.accounts_count
+        .dashboard__counters__label= t 'admin.tags.directory'
 
 %hr.spacer/