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

DEV: Remove deprecated site settings. (#15725)

This commit is contained in:
Alan Guo Xiang Tan 2022-02-07 11:26:06 +08:00 committed by GitHub
parent b7eacaed21
commit 454d3740b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/site_settings/deprecated_settings.rb
View File

@ -4,33 +4,7 @@ module SiteSettings; end
module SiteSettings::DeprecatedSettings
SETTINGS = [
['show_email_on_profile', 'moderators_view_emails', true, '2.4'],
['allow_moderators_to_create_categories', 'moderators_create_categories', true, '2.4'],
['disable_edit_notifications', 'disable_system_edit_notifications', true, '2.4'],
['enable_category_group_review', 'enable_category_group_moderation', true, '2.7'],
['newuser_max_images', 'newuser_max_embedded_media', true, '2.7'],
['min_trust_to_post_images', 'min_trust_to_post_embedded_media', true, '2.7'],
['moderators_create_categories', 'moderators_manage_categories_and_groups', '2.7'],
['enable_sso', 'enable_discourse_connect', true, '2.8'],
['sso_allows_all_return_paths', 'discourse_connect_allows_all_return_paths', true, '2.8'],
['enable_sso_provider', 'enable_discourse_connect_provider', true, '2.8'],
['verbose_sso_logging', 'verbose_discourse_connect_logging', true, '2.8'],
['sso_url', 'discourse_connect_url', true, '2.8'],
['sso_secret', 'discourse_connect_secret', true, '2.8'],
['sso_provider_secrets', 'discourse_connect_provider_secrets', true, '2.8'],
['sso_overrides_groups', 'discourse_connect_overrides_groups', true, '2.8'],
['sso_overrides_bio', 'discourse_connect_overrides_bio', true, '2.8'],
['sso_overrides_email', 'auth_overrides_email', true, '2.8'],
['sso_overrides_username', 'auth_overrides_username', true, '2.8'],
['sso_overrides_name', 'auth_overrides_name', true, '2.8'],
['sso_overrides_avatar', 'discourse_connect_overrides_avatar', true, '2.8'],
['sso_overrides_profile_background', 'discourse_connect_overrides_profile_background', true, '2.8'],
['sso_overrides_location', 'discourse_connect_overrides_location', true, '2.8'],
['sso_overrides_website', 'discourse_connect_overrides_website', true, '2.8'],
['sso_overrides_card_background', 'discourse_connect_overrides_card_background', true, '2.8'],
['external_auth_skip_create_confirm', 'auth_skip_create_confirm', true, '2.8'],
['external_auth_immediately', 'auth_immediately', true, '2.8'],
# [<old setting>, <new_setting>, <override>, <version to drop>]
['search_tokenize_chinese_japanese_korean', 'search_tokenize_chinese', true, '2.9'],
]

7
spec/requests/admin/site_settings_controller_spec.rb
View File

@ -46,11 +46,12 @@ describe Admin::SiteSettingsController do
end
it 'works for deprecated settings' do
put "/admin/site_settings/sso_url.json", params: {
sso_url: "https://example.com"
put "/admin/site_settings/search_tokenize_chinese_japanese_korean.json", params: {
search_tokenize_chinese_japanese_korean: true
}
expect(response.status).to eq(200)
expect(SiteSetting.discourse_connect_url).to eq("https://example.com")
expect(SiteSetting.search_tokenize_chinese).to eq(true)
end
it 'allows value to be a blank string' do