diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-12 14:30:05 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-12 14:30:05 +0000 |
| commit | 144a25ef4d11210f6ac04c212d1943843433419e (patch) | |
| tree | 2f98bd4017c6063b2b5072304c5c3efc4cfd3638 | |
| parent | 29bfe34521a3a2ddf16ae954706e355ea0ee6e4a (diff) | |
| parent | 7cb75aeb4612553f24237e79d459390c71470e0b (diff) | |
| download | gitlab-ce-144a25ef4d11210f6ac04c212d1943843433419e.tar.gz | |
Merge branch 'fog_expiration_date' of /home/git/repositories/gitlab/gitlabhq
| -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 45bc68f3220..6875fa74edd 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -15,5 +15,7 @@ if File.exists?(aws_file) config.fog_directory = AWS_CONFIG['bucket'] # required config.fog_public = false # optional, defaults to true config.fog_attributes = {'Cache-Control'=>'max-age=315576000'} # optional, defaults to {} + config.fog_authenticated_url_expiration = 1 << 29 # optional time (in seconds) that authenticated urls will be valid. + # when fog_public is false and provider is AWS or Google, defaults to 600 end end |