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
Léo-Paul Géneau
gitlab-ce
Commits
2c528aad
Commit
2c528aad
authored
Aug 17, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'grpc-1.4.5' into 'master'
Use grpc 1.4.5 Closes gitaly#468 See merge request !13597
parents
05fe4545
40752ce7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
10 deletions
+23
-10
Gemfile.lock
Gemfile.lock
+1
-1
lib/gitlab/gitaly_client/blob_service.rb
lib/gitlab/gitaly_client/blob_service.rb
+10
-3
lib/gitlab/gitaly_client/commit_service.rb
lib/gitlab/gitaly_client/commit_service.rb
+12
-6
No files found.
Gemfile.lock
View file @
2c528aad
...
@@ -356,7 +356,7 @@ GEM
...
@@ -356,7 +356,7 @@ GEM
activesupport
activesupport
grape (>= 0.16.0)
grape (>= 0.16.0)
rake
rake
grpc (1.4.
0
)
grpc (1.4.
5
)
google-protobuf (~> 3.1)
google-protobuf (~> 3.1)
googleauth (~> 0.5.1)
googleauth (~> 0.5.1)
haml (4.0.7)
haml (4.0.7)
...
...
lib/gitlab/gitaly_client/blob_service.rb
View file @
2c528aad
...
@@ -13,10 +13,17 @@ module Gitlab
...
@@ -13,10 +13,17 @@ module Gitlab
)
)
response
=
GitalyClient
.
call
(
@gitaly_repo
.
storage_name
,
:blob_service
,
:get_blob
,
request
)
response
=
GitalyClient
.
call
(
@gitaly_repo
.
storage_name
,
:blob_service
,
:get_blob
,
request
)
blob
=
response
.
first
data
=
''
return
unless
blob
.
oid
.
present?
blob
=
nil
response
.
each
do
|
msg
|
if
blob
.
nil?
blob
=
msg
end
data
<<
msg
.
data
end
data
=
response
.
reduce
(
blob
.
data
.
dup
)
{
|
memo
,
msg
|
memo
<<
msg
.
data
.
dup
}
return
nil
if
blob
.
oid
.
blank?
Gitlab
::
Git
::
Blob
.
new
(
Gitlab
::
Git
::
Blob
.
new
(
id:
blob
.
oid
,
id:
blob
.
oid
,
...
...
lib/gitlab/gitaly_client/commit_service.rb
View file @
2c528aad
...
@@ -60,15 +60,21 @@ module Gitlab
...
@@ -60,15 +60,21 @@ module Gitlab
)
)
response
=
GitalyClient
.
call
(
@repository
.
storage
,
:commit_service
,
:tree_entry
,
request
)
response
=
GitalyClient
.
call
(
@repository
.
storage
,
:commit_service
,
:tree_entry
,
request
)
entry
=
response
.
first
return
unless
entry
.
oid
.
present?
if
entry
.
type
==
:BLOB
entry
=
nil
rest_of_data
=
response
.
reduce
(
""
)
{
|
memo
,
msg
|
memo
<<
msg
.
data
}
data
=
''
entry
.
data
+=
rest_of_data
response
.
each
do
|
msg
|
if
entry
.
nil?
entry
=
msg
break
unless
entry
.
type
==
:BLOB
end
data
<<
msg
.
data
end
end
entry
.
data
=
data
entry
entry
unless
entry
.
oid
.
blank?
end
end
def
tree_entries
(
repository
,
revision
,
path
)
def
tree_entries
(
repository
,
revision
,
path
)
...
...
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