diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-05-18 23:40:33 -0500 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-05-18 23:40:33 -0500 |
| commit | f29d8b64e4bbea0dce64b4dfbae14422d64899c9 (patch) | |
| tree | eb2e0ebc962bfcc8bb04c21af274bd537e649959 /config/initializers/carrierwave.rb | |
| parent | 715959e58190eca661ea377b949af3515d8da913 (diff) | |
| parent | 4607323e130fe5b04e830f7a6de8083b070808f1 (diff) | |
| download | gitlab-ce-f29d8b64e4bbea0dce64b4dfbae14422d64899c9.tar.gz | |
Merge remote-tracking branch 'origin/master' into eReGeBe/gitlab-ce-feature/milestone-md
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'config/initializers/carrierwave.rb')
| -rw-r--r-- | config/initializers/carrierwave.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index df28d30d750..1933afcbfb1 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -2,7 +2,7 @@ CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/ aws_file = Rails.root.join('config', 'aws.yml') -if File.exists?(aws_file) +if File.exist?(aws_file) AWS_CONFIG = YAML.load(File.read(aws_file))[Rails.env] CarrierWave.configure do |config| @@ -20,7 +20,7 @@ if File.exists?(aws_file) config.fog_public = false # optional, defaults to {} - config.fog_attributes = { 'Cache-Control'=>'max-age=315576000' } + config.fog_attributes = { 'Cache-Control' => 'max-age=315576000' } # optional time (in seconds) that authenticated urls will be valid. # when fog_public is false and provider is AWS or Google, defaults to 600 |