Commit 4f8af50b authored by Jacob Vosmaer's avatar Jacob Vosmaer

Rubocop and comment fixes

parent 7bda1030
...@@ -454,8 +454,10 @@ production: &base ...@@ -454,8 +454,10 @@ production: &base
# introduced in 9.0). Eventually Gitaly use will become mandatory and # introduced in 9.0). Eventually Gitaly use will become mandatory and
# this option will disappear. # this option will disappear.
enabled: true enabled: true
# Default Gitaly authentication token. Can be overriden per storage. # Default Gitaly authentication token. Can be overriden per storage. Can
token: "" # be left blank when Gitaly is running locally on a Unix socket, which
# is the normal way to deploy Gitaly.
token:
# #
# 4. Advanced settings # 4. Advanced settings
......
...@@ -50,8 +50,8 @@ module Gitlab ...@@ -50,8 +50,8 @@ module Gitlab
address address
end end
# All RPC calls should use GitalyClient.call. This method makes sure # All Gitaly RPC call sites should use GitalyClient.call. This method
# that per-request authentication headers are set. # makes sure that per-request authentication headers are set.
def self.call(storage, service, rpc, request) def self.call(storage, service, rpc, request)
metadata = request_metadata(storage) metadata = request_metadata(storage)
metadata = yield(metadata) if block_given? metadata = yield(metadata) if block_given?
......
...@@ -28,7 +28,7 @@ module Gitlab ...@@ -28,7 +28,7 @@ module Gitlab
if Gitlab.config.gitaly.enabled if Gitlab.config.gitaly.enabled
server = { server = {
address: Gitlab::GitalyClient.address(project.repository_storage), 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 params[:Repository] = repository.gitaly_repository.to_h
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment