3 Commits

Author	SHA1	Message	Date
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
Jeff Atwood	20780a1eee	Revert "Merge branch 'master' of https://github.com/discourse/discourse" ... This reverts commit e62a85cf6f, reversing changes made to 2660c2e21d.	2020-05-22 20:25:56 -07:00
Martin Brennan	c0779df99d	FIX: Remove access control post FK from uploads (#9853)	2020-05-22 11:20:25 +10:00