Rubocop and comment fixes
This commit is contained in:
parent
7bda1030a5
commit
4f8af50b61
3 changed files with 7 additions and 5 deletions
|
@ -454,8 +454,10 @@ production: &base
|
|||
# introduced in 9.0). Eventually Gitaly use will become mandatory and
|
||||
# this option will disappear.
|
||||
enabled: true
|
||||
# Default Gitaly authentication token. Can be overriden per storage.
|
||||
token: ""
|
||||
# Default Gitaly authentication token. Can be overriden per storage. Can
|
||||
# be left blank when Gitaly is running locally on a Unix socket, which
|
||||
# is the normal way to deploy Gitaly.
|
||||
token:
|
||||
|
||||
#
|
||||
# 4. Advanced settings
|
||||
|
|
|
@ -50,8 +50,8 @@ module Gitlab
|
|||
address
|
||||
end
|
||||
|
||||
# All RPC calls should use GitalyClient.call. This method makes sure
|
||||
# that per-request authentication headers are set.
|
||||
# All Gitaly RPC call sites should use GitalyClient.call. This method
|
||||
# makes sure that per-request authentication headers are set.
|
||||
def self.call(storage, service, rpc, request)
|
||||
metadata = request_metadata(storage)
|
||||
metadata = yield(metadata) if block_given?
|
||||
|
|
|
@ -28,7 +28,7 @@ module Gitlab
|
|||
if Gitlab.config.gitaly.enabled
|
||||
server = {
|
||||
address: Gitlab::GitalyClient.address(project.repository_storage),
|
||||
token: Gitlab::GitalyClient.token(project.repository_storage),
|
||||
token: Gitlab::GitalyClient.token(project.repository_storage)
|
||||
}
|
||||
params[:Repository] = repository.gitaly_repository.to_h
|
||||
|
||||
|
|
Loading…
Reference in a new issue