about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-02-05 00:27:18 +0100
committerGitHub <noreply@github.com>2019-02-05 00:27:18 +0100
commit2557cb2f9550f7ab0cd6e6f392642b5249589ed8 (patch)
tree92020ed6651cd43fef5bcb89ee0149d3cf7b7f4c /app/controllers/settings
parente02a13f64e5c2c93fa73a67a4ce32a7d1df24760 (diff)
Fix pinned statuses being shown in a featured hashtag (#9971)
Diffstat (limited to 'app/controllers/settings')
-rw-r--r--app/controllers/settings/featured_tags_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/settings/featured_tags_controller.rb b/app/controllers/settings/featured_tags_controller.rb
index 19815e416..3a3241425 100644
--- a/app/controllers/settings/featured_tags_controller.rb
+++ b/app/controllers/settings/featured_tags_controller.rb
@@ -38,7 +38,7 @@ class Settings::FeaturedTagsController < Settings::BaseController
   end
 
   def set_featured_tags
-    @featured_tags = current_account.featured_tags.reject(&:new_record?)
+    @featured_tags = current_account.featured_tags.order(statuses_count: :desc).reject(&:new_record?)
   end
 
   def set_most_used_tags