mirror of
https://github.com/discourse/discourse.git
synced 2024-11-23 06:29:30 +08:00
Remove old access_password_removal cruft from 1.5 years ago
This commit is contained in:
parent
024b88e9c2
commit
4975fc2890
|
@ -41,7 +41,6 @@ class AdminDashboardData
|
|||
send_consumer_email_check,
|
||||
title_check,
|
||||
site_description_check,
|
||||
access_password_removal,
|
||||
site_contact_username_check,
|
||||
notification_email_check
|
||||
].compact
|
||||
|
@ -187,19 +186,4 @@ class AdminDashboardData
|
|||
I18n.t('dashboard.ruby_version_warning') if RUBY_VERSION == '2.0.0' and RUBY_PATCHLEVEL < 247
|
||||
end
|
||||
|
||||
# TODO: generalize this method of putting i18n keys with expiry in redis
|
||||
# that should be reported on the admin dashboard:
|
||||
def access_password_removal
|
||||
if i18n_key = $redis.get(AdminDashboardData.access_password_removal_key)
|
||||
I18n.t(i18n_key)
|
||||
end
|
||||
end
|
||||
|
||||
def self.report_access_password_removal
|
||||
$redis.setex access_password_removal_key, 172_800, 'dashboard.access_password_removal'
|
||||
end
|
||||
|
||||
def self.access_password_removal_key
|
||||
'dash-data:access_password_removal'
|
||||
end
|
||||
end
|
||||
|
|
|
@ -604,7 +604,6 @@ en:
|
|||
title_nag: "Enter the name of your site. Update title in <a href='/admin/site_settings'>Site Settings</a>."
|
||||
site_description_missing: "Enter a one sentence description of your site that will appear in search results. Update site_description in <a href='/admin/site_settings'>Site Settings</a>."
|
||||
consumer_email_warning: "Your site is configured to use Gmail (or another consumer email service) to send email. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limits how many emails you can send</a>. Consider using an email service provider like mandrill.com to ensure email deliverability."
|
||||
access_password_removal: "Your site was using the access_password setting, which has been removed. The login_required and must_approve_users settings have been enabled, which should be used instead. You can change them in the <a href='/admin/site_settings'>Site Settings</a>. Be sure to <a href='/admin/users/list/pending'>approve users in the Pending Users list</a>. (This message will go away after 2 days.)"
|
||||
site_contact_username_warning: "Enter the name of a friendly staff user account to send important automated private messages from, such as the new user welcome, flag warnings, etc. Update site_contact_username in <a href='/admin/site_settings'>Site Settings</a>."
|
||||
notification_email_warning: "Notification emails are not being sent from a valid email address on your domain; email delivery will be erratic and unreliable. Please set notification_email to a valid local email address in <a href='/admin/site_settings'>Site Settings</a>."
|
||||
|
||||
|
|
|
@ -5,7 +5,6 @@ class RemoveAccessPassword < ActiveRecord::Migration
|
|||
execute "DELETE FROM site_settings where name='access_password'"
|
||||
SiteSetting.login_required = true
|
||||
SiteSetting.must_approve_users = true
|
||||
AdminDashboardData.report_access_password_removal rescue nil
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user