summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMarkus Koller <markus-koller@gmx.ch>2017-07-20 10:50:07 +0200
committerMarkus Koller <markus-koller@gmx.ch>2017-07-27 13:24:19 +0200
commitd27dec80ceb372a5aace7c69e3bdba841d1ed863 (patch)
treea85699a100afe8e46e26e025b9d17c4d97356f01 /config
parent4d05e85375b81d94ef828c8c5544bf62a5abc024 (diff)
downloadgitlab-ce-d27dec80ceb372a5aace7c69e3bdba841d1ed863.tar.gz
Support custom directory in gitlab:backup:create task
Diffstat (limited to 'config')
-rw-r--r--config/initializers/1_settings.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 201a1d062b9..02d3161f769 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -459,10 +459,6 @@ Settings.backup['pg_schema'] = nil
Settings.backup['path'] = Settings.absolute(Settings.backup['path'] || "tmp/backups/")
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']
- Settings.backup['upload']['connection'] = Hash[Settings.backup['upload']['connection'].map { |k, v| [k.to_sym, v] }]
-end
Settings.backup['upload']['multipart_chunk_size'] ||= 104857600
Settings.backup['upload']['encryption'] ||= nil
Settings.backup['upload']['storage_class'] ||= nil