diff options
-rw-r--r-- | config.toml.example | 3 | ||||
-rw-r--r-- | ruby/spec/integration_helper.rb | 11 |
2 files changed, 11 insertions, 3 deletions
diff --git a/config.toml.example b/config.toml.example index 0822e8ca1..b3cd6057e 100644 --- a/config.toml.example +++ b/config.toml.example @@ -63,6 +63,9 @@ dir = "/home/git/gitaly/ruby" # # # Number of gitaly-ruby worker processes # num_workers = 2 +# +# # Override Linguist languages path +# linguist_languages_path = "" [gitlab-shell] # The directory where gitlab-shell is installed diff --git a/ruby/spec/integration_helper.rb b/ruby/spec/integration_helper.rb index 0186d0514..b4e118ff9 100644 --- a/ruby/spec/integration_helper.rb +++ b/ruby/spec/integration_helper.rb @@ -18,19 +18,24 @@ end def start_gitaly build_dir = File.expand_path('../../../_build', __FILE__) gitlab_shell_dir = File.join(TMP_DIR, 'gitlab-shell') + linguist_path = File.join( + Bundler.rubygems.find_name('github-linguist').first.full_gem_path, + "lib", "linguist", "languages.json" + ) FileUtils.mkdir_p([TMP_DIR, File.join(gitlab_shell_dir, 'hooks')]) config_toml = <<~CONFIG socket_path = "#{SOCKET_PATH}" bin_dir = "#{build_dir}/bin" - + [gitlab-shell] dir = "#{gitlab_shell_dir}" - + [gitaly-ruby] dir = "#{build_dir}/assembly/ruby" - + linguist_languages_path = "#{linguist_path}" + [[storage]] name = "#{DEFAULT_STORAGE_NAME}" path = "#{DEFAULT_STORAGE_DIR}" |