Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Remove new_version_emails global setting reference 

All site settings are now shadowed by global settings, so there is no need to lookup the global setting explicitly
This commit is contained in:
David Taylor 2019-11-20 15:54:09 +00:00
parent 22e713d2b0
commit e1fcbf4aef
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/jobs/scheduled/version_check.rb
View File

@ -17,8 +17,7 @@ module Jobs
DiscourseUpdates.updated_at = Time.zone.now DiscourseUpdates.updated_at = Time.zone.now
DiscourseUpdates.missing_versions = json['versions'] DiscourseUpdates.missing_versions = json['versions']
if GlobalSetting.new_version_emails && if SiteSetting.new_version_emails &&
SiteSetting.new_version_emails &&
json['missingVersionsCount'] > (0) && json['missingVersionsCount'] > (0) &&
prev_missing_versions_count < (json['missingVersionsCount'].to_i) prev_missing_versions_count < (json['missingVersionsCount'].to_i)

5
config/discourse_defaults.conf
View File

@ -157,11 +157,6 @@ sidekiq_workers = 5
# adjust stylesheets to rtl (requires "rtlit" gem) # adjust stylesheets to rtl (requires "rtlit" gem)
rtl_css = false rtl_css = false
# notify admin when a new version of discourse is released
# this is global so it is easier to set in multisites
# TODO allow for global overrides
new_version_emails = true
# connection reaping helps keep connection counts down, postgres # connection reaping helps keep connection counts down, postgres
# will not work properly with huge numbers of open connections # will not work properly with huge numbers of open connections
# reap connections from pool that are older than 30 seconds # reap connections from pool that are older than 30 seconds