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
..
base_store.rb	FEATURE: extend duration allowed for download	2020-05-15 12:45:47 +10:00
local_store.rb	REFACTOR: Restoring of backups and migration of uploads to S3	2020-01-14 11:41:35 +01:00
s3_store.rb	Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse""	2020-05-23 00:56:13 -04:00
to_s3_migration.rb	FIX: Restore to S3 didn't work without env variables	2020-04-19 20:24:40 +02:00