Commit 3f252ed1 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #2621 from jouve/default_setting

add default for Settings['satellites']
parents 729088a7 31e338b8
...@@ -78,4 +78,5 @@ Settings.git['max_size'] ||= 5242880 # 5.megabytes ...@@ -78,4 +78,5 @@ Settings.git['max_size'] ||= 5242880 # 5.megabytes
Settings.git['bin_path'] ||= '/usr/bin/git' Settings.git['bin_path'] ||= '/usr/bin/git'
Settings.git['timeout'] ||= 10 Settings.git['timeout'] ||= 10
Settings['satellites'] ||= {}
Settings.satellites['path'] ||= '/home/gitlab/gitlab/tmp/repo_satellites/' Settings.satellites['path'] ||= '/home/gitlab/gitlab/tmp/repo_satellites/'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment