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 #2801 from jrhe/s3_govcloud_support 

Adds govcloud region to s3 region list
This commit is contained in:
Sam 2014-09-17 00:23:26 +10:00
parent a3276c042d 38202d5037
commit 96660b58fa
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/s3_region_site_setting.rb
View File

@ -14,10 +14,11 @@ class S3RegionSiteSetting < EnumSiteSetting
'us-east-1', 'us-east-1',
'us-west-1', 'us-west-1',
'us-west-2', 'us-west-2',
'us-gov-west-1',
'eu-west-1', 'eu-west-1',
'ap-southeast-1', 'ap-southeast-1',
'ap-southeast-2', 'ap-southeast-2',
'ap-northeast-1', 'ap-northeast-1',
'sa-east-1' ] 'sa-east-1']
end end
end end

2
spec/models/s3_region_site_setting_spec.rb
View File

@ -14,7 +14,7 @@ describe S3RegionSiteSetting do
describe 'values' do describe 'values' do
it 'returns all the S3 regions and blank' do it 'returns all the S3 regions and blank' do
expect(S3RegionSiteSetting.values.map {|x| x[:value]}.sort).to eq(['', 'us-east-1', 'us-west-1', 'us-west-2', 'eu-west-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'sa-east-1'].sort) expect(S3RegionSiteSetting.values.map {|x| x[:value]}.sort).to eq(['', 'us-east-1', 'us-west-1', 'us-west-2', 'us-gov-west-1', 'eu-west-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'sa-east-1'].sort)
end end
end end