mirror of
https://github.com/discourse/discourse.git
synced 2026-08-13 06:25:11 -05:00
Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse""
This reverts commit20780a1eee. * SECURITY: re-adds accidentally reverted commit:03d26cd6: ensure embed_url contains valid http(s) uri * when the merge commite62a85cfwas reverted, git chose the2660c2e2parent to land on instead of the03d26cd6parent (which contains security fixes)
This commit is contained in:
@@ -75,6 +75,8 @@ class DiscoursePluginRegistry
|
||||
|
||||
define_filtered_register :editable_group_custom_fields
|
||||
|
||||
define_filtered_register :topic_thumbnail_sizes
|
||||
|
||||
def self.register_auth_provider(auth_provider)
|
||||
self.auth_providers << auth_provider
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user