Merge pull request #2621 from jouve/default_setting

add default for Settings['satellites']

Merge pull request #2621 from jouve/default_setting
add default for Settings['satellites']
Dmitriy Zaporozhets
2 parents 729088a7 31e338b8
Showing 1 changed file with 1 additions and 0 deletions Show diff stats
config/initializers/1_settings.rb
@@ -78,4 +78,5 @@ Settings.git[&#39;max_size&#39;]  ||= 5242880 # 5.megabytes
 Settings.git['bin_path']  ||= '/usr/bin/git'
 Settings.git['timeout']   ||= 10
  
+Settings['satellites'] ||= {}
 Settings.satellites['path']   ||= '/home/gitlab/gitlab/tmp/repo_satellites/'
...	...	@@ -78,4 +78,5 @@ Settings.git['max_size'] \|\|= 5242880 # 5.megabytes
78	78	Settings.git['bin_path'] \|\|= '/usr/bin/git'
79	79	Settings.git['timeout'] \|\|= 10
80	80
	81	+Settings['satellites'] \|\|= {}
81	82	Settings.satellites['path'] \|\|= '/home/gitlab/gitlab/tmp/repo_satellites/'
...	...