diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-24 20:28:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-24 20:28:19 +0300 |
| commit | 0c2b07bfcb884e2b1ab6b5521596423578a3cdf8 (patch) | |
| tree | e141bb9c790d02bdcae6d3d66f563c94475a9d51 /lib | |
| parent | a77c4d2dce9e77e7104f009822faf56063a37dea (diff) | |
Add latest changes from gitlab-org/gitlab@15-5-stable-ee
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/kas/client.rb | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab/gitaly.rake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/kas/client.rb b/lib/gitlab/kas/client.rb index 753a185344e..768810d5545 100644 --- a/lib/gitlab/kas/client.rb +++ b/lib/gitlab/kas/client.rb @@ -64,7 +64,7 @@ module Gitlab def credentials if URI(Gitlab::Kas.internal_url).scheme == 'grpcs' - GRPC::Core::ChannelCredentials.new + GRPC::Core::ChannelCredentials.new(::Gitlab::X509::Certificate.ca_certs_bundle) else :this_channel_is_insecure end diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake index 960d0e51a47..e814d59aaf9 100644 --- a/lib/tasks/gitlab/gitaly.rake +++ b/lib/tasks/gitlab/gitaly.rake @@ -34,7 +34,7 @@ Usage: rake "gitlab:gitaly:install[/installation/dir,/storage/path]") env["BUNDLE_DEPLOYMENT"] = 'false' end - output, status = Gitlab::Popen.popen([make_cmd, 'clean-build', 'all', 'git'], nil, env) + output, status = Gitlab::Popen.popen([make_cmd, 'clean-build', 'all'], nil, env) raise "Gitaly failed to compile: #{output}" unless status&.zero? end end |