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
..
distributed_cache_spec.rb	DEV: use #frozen_string_literal: true on all spec	2019-04-30 10:27:42 +10:00
jobs_spec.rb	DEV: use #frozen_string_literal: true on all spec	2019-04-30 10:27:42 +10:00
pausable_spec.rb	DEV: Upgrading Discourse to Zeitwerk (#8098)	2019-10-02 14:01:53 +10:00
post_spec.rb	FIX: multisite upload urls must have either db name or the word 'short-url'.	2019-06-25 01:19:58 +05:30
s3_store_spec.rb	Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse""	2020-05-23 00:56:13 -04:00
site_settings_spec.rb	FEATURE: English locale with international date formats	2019-05-20 13:47:20 +02:00