Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-11 21:04:42 +08:00
Code Packages Activity Actions 10

FIX: Do not enable published page if secure media enabled (#11131)

Browse source 
There are issues around displaying images on published pages when secure media is enabled. This PR temporarily makes it appear as if published pages are enabled if secure media is also enabled.
This commit is contained in:
Martin Brennan 2020-11-06 10:33:19 +10:00 • committed by GitHub
parent 2d4455161b
commit 00c8f520e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 76 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
spec/support/uploads_helpers.rb
View file

@ -13,6 +13,11 @@ module UploadsHelpers
stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/")
end

def enable_secure_media
setup_s3
SiteSetting.secure_media = true
end

def stub_upload(upload)
url = "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/original/1X/#{upload.sha1}.#{upload.extension}?acl"
stub_request(:put, url)