IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix s3_cdn_url when the s3 bucket contains a folder

Browse Source
This commit is contained in:
Andrew Schleifer
2018-05-22 16:21:52 -05:00
parent ea7ffac17e
commit 4be0e31459
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/s3_helper.rb
View File

@@ -4,7 +4,7 @@ class S3Helper
class SettingMissing < StandardError; end
attr_reader :s3_bucket_name
attr_reader :s3_bucket_name, :s3_bucket_folder_path
def initialize(s3_bucket_name, tombstone_prefix = '', options = {})
@s3_options = default_s3_options.merge(options)