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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
fbf4b95c
Commit
fbf4b95c
authored
Nov 29, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflict in lib/gitlab/gitaly_client.rb
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
3d6f96a3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
7 deletions
+0
-7
lib/gitlab/gitaly_client.rb
lib/gitlab/gitaly_client.rb
+0
-7
No files found.
lib/gitlab/gitaly_client.rb
View file @
fbf4b95c
...
...
@@ -118,11 +118,7 @@ module Gitlab
# end
#
def
self
.
call
(
storage
,
service
,
rpc
,
request
,
remote_storage:
nil
,
timeout:
nil
)
<<<<<<<
HEAD
start
=
Process
.
clock_gettime
(
Process
::
CLOCK_MONOTONIC
)
=======
start
=
Gitlab
::
Metrics
::
System
.
monotonic_time
>>>>>>>
upstream
/
master
enforce_gitaly_request_limits
(
:call
)
kwargs
=
request_kwargs
(
storage
,
timeout
,
remote_storage:
remote_storage
)
...
...
@@ -139,14 +135,11 @@ module Gitlab
duration
)
end
<<<<<<<
HEAD
=======
def
self
.
current_transaction_labels
Gitlab
::
Metrics
::
Transaction
.
current
&
.
labels
||
{}
end
private_class_method
:current_transaction_labels
>>>>>>>
upstream
/
master
def
self
.
request_kwargs
(
storage
,
timeout
,
remote_storage:
nil
)
encoded_token
=
Base64
.
strict_encode64
(
token
(
storage
).
to_s
)
metadata
=
{
...
...
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