diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-02 21:34:16 -0800 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-02 21:34:16 -0800 |
commit | 7d48205c1a472c07969e4dc43965fa3090b84376 (patch) | |
tree | 2d656569885ea8c9b281b3595954846c2e6dd800 /config/initializers/carrierwave.rb | |
parent | 7558fe98759ec28c2fd97ae10cb1610a1a6c38cd (diff) | |
download | gitlab-ce-7d48205c1a472c07969e4dc43965fa3090b84376.tar.gz |
Rubocop: comment indentation
Diffstat (limited to 'config/initializers/carrierwave.rb')
-rw-r--r-- | config/initializers/carrierwave.rb | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index 667f198667c..bfb8656df55 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -12,11 +12,19 @@ if File.exists?(aws_file) aws_secret_access_key: AWS_CONFIG['secret_access_key'], # required region: AWS_CONFIG['region'], # optional, defaults to 'us-east-1' } - 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 + + # required + config.fog_directory = AWS_CONFIG['bucket'] + + # optional, defaults to true + config.fog_public = false + + # optional, defaults to {} + 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 + config.fog_authenticated_url_expiration = 1 << 29 end # Mocking Fog requests, based on: https://github.com/carrierwaveuploader/carrierwave/wiki/How-to%3A-Test-Fog-based-uploaders |