Merge branch 'gitaly-386-shell-config' into 'master'

lib/tasks/gitlab/gitaly.rake

@@ -66,6 +66,7 @@ namespace :gitlab do
       config = { socket_path: address.sub(%r{\Aunix:}, ''), storage: storages }
       config[:auth] = { token: 'secret' } if Rails.env.test?
       config[:'gitaly-ruby'] = { dir: File.join(Dir.pwd, 'ruby') } if gitaly_ruby
+      config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path }
       TOML.dump(config)
     end
 

spec/tasks/gitlab/gitaly_rake_spec.rb

@@ -105,6 +105,8 @@ describe 'gitlab:gitaly namespace rake task' do
           # Gitaly storage configuration generated from #{Gitlab.config.source} on #{Time.current.to_s(:long)}
           # This is in TOML format suitable for use in Gitaly's config.toml file.
           socket_path = "/path/to/my.socket"
+          [gitlab-shell]
+          dir = "#{Gitlab.config.gitlab_shell.path}"
           [[storage]]
           name = "default"
           path = "/path/to/default"