Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
13487809
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
13487809
编写于
3月 30, 2017
作者:
J
Jacob Vosmaer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Pass Gitaly Repository messages to workhorse
上级
88812ce2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
3 deletion
+17
-3
lib/gitlab/workhorse.rb
lib/gitlab/workhorse.rb
+10
-2
spec/lib/gitlab/workhorse_spec.rb
spec/lib/gitlab/workhorse_spec.rb
+7
-1
未找到文件。
lib/gitlab/workhorse.rb
浏览文件 @
13487809
...
@@ -17,14 +17,22 @@ module Gitlab
...
@@ -17,14 +17,22 @@ module Gitlab
class
<<
self
class
<<
self
def
git_http_ok
(
repository
,
user
)
def
git_http_ok
(
repository
,
user
)
repo_path
=
repository
.
path_to_repo
params
=
{
params
=
{
GL_ID
:
Gitlab
::
GlId
.
gl_id
(
user
),
GL_ID
:
Gitlab
::
GlId
.
gl_id
(
user
),
RepoPath
:
repo
sitory
.
path_to_repo
,
RepoPath
:
repo
_path
,
}
}
if
Gitlab
.
config
.
gitaly
.
enabled
if
Gitlab
.
config
.
gitaly
.
enabled
address
=
Gitlab
::
GitalyClient
.
get_address
(
repository
.
project
.
repository_storage
)
storage
=
repository
.
project
.
repository_storage
address
=
Gitlab
::
GitalyClient
.
get_address
(
storage
)
params
[
:GitalySocketPath
]
=
URI
(
address
).
path
params
[
:GitalySocketPath
]
=
URI
(
address
).
path
# TODO: use GitalyClient code to assemble the Repository message
params
[
:Repository
]
=
Gitaly
::
Repository
.
new
(
path:
repo_path
,
storage_name:
storage
,
relative_path:
Gitlab
::
RepoPath
.
strip_storage_path
(
repo_path
),
).
to_h
end
end
params
params
...
...
spec/lib/gitlab/workhorse_spec.rb
浏览文件 @
13487809
...
@@ -179,10 +179,11 @@ describe Gitlab::Workhorse, lib: true do
...
@@ -179,10 +179,11 @@ describe Gitlab::Workhorse, lib: true do
describe
'.git_http_ok'
do
describe
'.git_http_ok'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:repo_path
)
{
repository
.
path_to_repo
}
subject
{
described_class
.
git_http_ok
(
repository
,
user
)
}
subject
{
described_class
.
git_http_ok
(
repository
,
user
)
}
it
{
expect
(
subject
).
to
eq
({
GL_ID
:
"user-
#{
user
.
id
}
"
,
RepoPath
:
repo
sitory
.
path_to_repo
})
}
it
{
expect
(
subject
).
to
eq
({
GL_ID
:
"user-
#{
user
.
id
}
"
,
RepoPath
:
repo
_path
})
}
context
'when Gitaly is enabled'
do
context
'when Gitaly is enabled'
do
before
do
before
do
...
@@ -192,6 +193,11 @@ describe Gitlab::Workhorse, lib: true do
...
@@ -192,6 +193,11 @@ describe Gitlab::Workhorse, lib: true do
it
'includes Gitaly params in the returned value'
do
it
'includes Gitaly params in the returned value'
do
gitaly_socket_path
=
URI
(
Gitlab
::
GitalyClient
.
get_address
(
'default'
)).
path
gitaly_socket_path
=
URI
(
Gitlab
::
GitalyClient
.
get_address
(
'default'
)).
path
expect
(
subject
).
to
include
({
GitalySocketPath
:
gitaly_socket_path
})
expect
(
subject
).
to
include
({
GitalySocketPath
:
gitaly_socket_path
})
expect
(
subject
[
:Repository
]).
to
include
({
path:
repo_path
,
storage_name:
'default'
,
relative_path:
project
.
full_path
+
'.git'
,
})
end
end
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录