diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-02 20:36:54 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-02 20:36:54 -0800 |
| commit | e89058268118e3b2be4ebaf5d7bf2c684b590437 (patch) | |
| tree | 94f7b8986ebc3ae2a7c75ed9457628371f97a14b /config/initializers | |
| parent | 84a5a548a5e1377f34b7989fc546eaedf86c3510 (diff) | |
| download | gitlab-ce-e89058268118e3b2be4ebaf5d7bf2c684b590437.tar.gz | |
Rubocop enabled for: Use spaces inside hash literal braces
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 2 | ||||
| -rw-r--r-- | config/initializers/carrierwave.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 1ec842761ff..4296e755370 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -148,7 +148,7 @@ Settings.gitlab_shell['ssh_path_prefix'] ||= Settings.send(:build_gitlab_shell_s Settings['backup'] ||= Settingslogic.new({}) Settings.backup['keep_time'] ||= 0 Settings.backup['path'] = File.expand_path(Settings.backup['path'] || "tmp/backups/", Rails.root) -Settings.backup['upload'] ||= Settingslogic.new({'remote_directory' => nil, 'connection' => nil}) +Settings.backup['upload'] ||= Settingslogic.new({ 'remote_directory' => nil, 'connection' => nil }) # Convert upload connection settings to use symbol keys, to make Fog happy if Settings.backup['upload']['connection'] Settings.backup['upload']['connection'] = Hash[Settings.backup['upload']['connection'].map { |k, v| [k.to_sym, v] }] diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index 10dfc30a0c5..667f198667c 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -14,7 +14,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_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 |