mirror of
https://github.com/codeninjasllc/discourse.git
synced 2025-04-10 22:14:35 -04:00
oops messed up merge
This commit is contained in:
parent
1357f16563
commit
adeb987c70
1 changed files with 1 additions and 1 deletions
|
@ -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?
|
||||
|
|
Loading…
Add table
Reference in a new issue