diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2017-05-02 13:20:41 -0500 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-05-02 13:20:41 -0500 |
| commit | bbfbcebdf69261bac6aa142f430719955e8e86b9 (patch) | |
| tree | 25916a1a761cb6c8fcdac4b20b76017a7f4506d3 /config/initializers/carrierwave.rb | |
| parent | 3b82444eb7791e58e3e0ba2f08b8ccde48e3d4c6 (diff) | |
| parent | 920d55b9f8afd35e16351fb57d671acf66092e89 (diff) | |
| download | gitlab-ce-bbfbcebdf69261bac6aa142f430719955e8e86b9.tar.gz | |
Merge branch 'master' into 28433-internationalise-cycle-analytics-page
Diffstat (limited to 'config/initializers/carrierwave.rb')
| -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 |