Michael Brown d9a02d1336 Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse"" ... This reverts commit 20780a1eee. * SECURITY: re-adds accidentally reverted commit: 03d26cd6: ensure embed_url contains valid http(s) uri * when the merge commit e62a85cf was reverted, git chose the 2660c2e2 parent to land on instead of the 03d26cd6 parent (which contains security fixes)		2020-05-23 00:56:13 -04:00
..
advanced_user_narrative_spec.rb	DEV: Use method instead of constant for discobot badge names	2020-04-09 20:46:51 -06:00
new_user_narrative_spec.rb	FIX: Change bookmarks-with-reminders URL back to bookmarks for user activity (#9566)	2020-04-29 10:53:37 +10:00
store_spec.rb	DEV: enable frozen string literal on all files	2019-05-13 09:31:32 +08:00
track_selector_spec.rb	Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse""	2020-05-23 00:56:13 -04:00