diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-06 12:16:36 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-06 12:16:36 +0200 |
| commit | 4f24eb2aa670877faeef0f486af00d74e007ad01 (patch) | |
| tree | 3b8c9ccbe779050db829565910e8652392af4dcf /config/initializers/1_settings.rb | |
| parent | c6799b0e1ecd1b7373f0ea23195e18c7ad5c199d (diff) | |
| parent | fff36a8b8965e4bddd8020caf5072e79bf131a74 (diff) | |
| download | gitlab-ce-merge-notifs.tar.gz | |
Merge branch 'master' into merge-notifsmerge-notifs
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 7b5d488f59e..bd76c918485 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -170,6 +170,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['archive_permissions'] ||= 0600 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'] |