Commit 144a25ef authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fog_expiration_date' of /home/git/repositories/gitlab/gitlabhq

parents 29bfe345 7cb75aeb
......@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment