diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-01 23:15:17 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-01 23:15:17 +0300 |
| commit | 8100f9686dcd729f42d14e86cb9b36b403e036ac (patch) | |
| tree | 269301ab963afab0056c68300d2c7bbd64b114a2 /config | |
| parent | 3d318f3c92d2e6ff8d03c94015bacf44c2542fdd (diff) | |
| parent | d261f83626b9abde93f91d9850ae3e989348e12d (diff) | |
Merge branch 'zj-upgrade-carrierwave' into 'master'
Update Carrierwave and fog-core
See merge request !11016
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/carrierwave.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index 1933afcbfb1..cd7df44351a 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -6,6 +6,8 @@ if File.exist?(aws_file) AWS_CONFIG = YAML.load(File.read(aws_file))[Rails.env] CarrierWave.configure do |config| + config.fog_provider = 'fog/aws' + config.fog_credentials = { provider: 'AWS', # required aws_access_key_id: AWS_CONFIG['access_key_id'], # required |