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

2019-01-20 16:49:23 +01:00
parent aa362ab73d 31e7940de5
commit 9dfbcf941e
37 changed files with 492 additions and 64 deletions
--- a/app/controllers/directories_controller.rb
+++ b/app/controllers/directories_controller.rb
@ -33,7 +33,7 @@ class DirectoriesController < ApplicationController
  end

  def set_tags
-    @tags = Tag.discoverable.limit(30)
+    @tags = Tag.discoverable.limit(30).reject { |tag| tag.cached_sample_accounts.empty? }
  end

  def set_accounts