Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
4f8af50b
Commit
4f8af50b
authored
Jun 20, 2017
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rubocop and comment fixes
parent
7bda1030
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
config/gitlab.yml.example
config/gitlab.yml.example
+4
-2
lib/gitlab/gitaly_client.rb
lib/gitlab/gitaly_client.rb
+2
-2
lib/gitlab/workhorse.rb
lib/gitlab/workhorse.rb
+1
-1
No files found.
config/gitlab.yml.example
View file @
4f8af50b
...
@@ -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
...
...
lib/gitlab/gitaly_client.rb
View file @
4f8af50b
...
@@ -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?
...
...
lib/gitlab/workhorse.rb
View file @
4f8af50b
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment