From adeb987c70ab3fc9100bd39b723f144749c6ab4b Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Thu, 24 Oct 2013 12:09:49 +1100
Subject: [PATCH] oops messed up merge
---
app/models/site_setting.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index fa6e8a0c031..8599c6719aa 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -268,7 +268,7 @@ class SiteSetting < ActiveRecord::Base
setting(:dominating_topic_minimum_percent, 20)
# hidden setting only used by system
- hidden_setting(:uncategorized_category_id, -1, hidden: true)
+ setting(:uncategorized_category_id, -1, hidden: true)
def self.call_discourse_hub?
self.enforce_global_nicknames? && self.discourse_org_access_key.present?