FEATURE: Site setting to always show category definitions (#10124)

FEATURE: Site setting to always show category definitions (#10124)

diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index e635a88..5f43378 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -52,7 +52,9 @@ class ListController < ApplicationController
       list_opts = build_topic_list_options
       list_opts.merge!(options) if options
       user = list_target_user
-      list_opts[:no_definitions] = true if params[:category].blank? && filter == :latest
+      if params[:category].blank? && filter == :latest && !SiteSetting.show_category_definitions_in_topic_lists
+        list_opts[:no_definitions] = true
+      end
 
       list = TopicQuery.new(user, list_opts).public_send("list_#{filter}")
 
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 079232c..557d7bd 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2034,6 +2034,9 @@ uncategorized:
   overridden_robots_txt:
     default: ""
     hidden: true
+  show_category_definitions_in_topic_lists:
+    default: false
+    hidden: true
 
 user_preferences:
   default_email_digest_frequency:

GitHub sha: cd5cfc14

This commit appears in #10124 which was approved by eviltrout. It was merged by markvanlan.