Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #743 from sjml/patch-1 

Fixing Amazon uploads to not be hardcoded to https
This commit is contained in:
Jeff Atwood 2013-04-19 18:32:05 -07:00
parent b644509c28 42fdbe2fb6
commit 8c8706a711
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/upload.rb
View File

@ -57,7 +57,7 @@ class Upload < ActiveRecord::Base
public: true, public: true,
content_type: file.content_type) content_type: file.content_type)
upload.width, upload.height = ImageSizer.resize(*image_info.size) upload.width, upload.height = ImageSizer.resize(*image_info.size)
upload.url = "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com#{path}/#{remote_filename}" upload.url = "//#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com#{path}/#{remote_filename}"
upload.save upload.save