Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents 32e18169 144a25ef
Showing 1 changed file with 2 additions and 0 deletions Show diff stats
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
...	...	@@ -15,5 +15,7 @@ if File.exists?(aws_file)
15	15	config.fog_directory = AWS_CONFIG['bucket'] # required
16	16	config.fog_public = false # optional, defaults to true
17	17	config.fog_attributes = {'Cache-Control'=>'max-age=315576000'} # optional, defaults to {}
	18	+ config.fog_authenticated_url_expiration = 1 << 29 # optional time (in seconds) that authenticated urls will be valid.
	19	+ # when fog_public is false and provider is AWS or Google, defaults to 600
18	20	end
19	21	end
...	...