diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-01-25 19:06:55 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-01-25 19:06:55 +0300 |
| commit | 2b8f19435bd81b24f512236245445109c14a2297 (patch) | |
| tree | 5380acd4f4c798a513dc70d2f769dc1aedc450f3 /lib/gitlab/gitaly_client.rb | |
| parent | 51441b97abdec1c37c96173b08c7b527f342b80f (diff) | |
| parent | e3cacb95a85080c9bd8993b26e996d952fbab05f (diff) | |
Merge branch 'elasticsearch-via-gitaly-ee' into 'master'
Add connection_data method to Gitaly client
See merge request gitlab-org/gitlab-ce!24669
Diffstat (limited to 'lib/gitlab/gitaly_client.rb')
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 85afbd85fe6..0ab53f8f706 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -133,7 +133,11 @@ module Gitlab end def self.address_metadata(storage) - Base64.strict_encode64(JSON.dump({ storage => { 'address' => address(storage), 'token' => token(storage) } })) + Base64.strict_encode64(JSON.dump(storage => connection_data(storage))) + end + + def self.connection_data(storage) + { 'address' => address(storage), 'token' => token(storage) } end # All Gitaly RPC call sites should use GitalyClient.call. This method |