Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
85d88d67
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,体验更适合开发者的 AI 搜索 >>
提交
85d88d67
编写于
8月 28, 2019
作者:
J
Jacob Vosmaer
提交者:
Michael Kozono
8月 28, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support Gitaly feature flags in workhorse
上级
c21c3c6c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
25 addition
and
3 deletion
+25
-3
GITLAB_WORKHORSE_VERSION
GITLAB_WORKHORSE_VERSION
+1
-1
lib/gitlab/workhorse.rb
lib/gitlab/workhorse.rb
+4
-2
spec/lib/gitlab/workhorse_spec.rb
spec/lib/gitlab/workhorse_spec.rb
+13
-0
spec/requests/api/project_snapshots_spec.rb
spec/requests/api/project_snapshots_spec.rb
+7
-0
未找到文件。
GITLAB_WORKHORSE_VERSION
浏览文件 @
85d88d67
8.
8
.0
8.
9
.0
lib/gitlab/workhorse.rb
浏览文件 @
85d88d67
...
...
@@ -34,7 +34,8 @@ module Gitlab
GitConfigOptions
:
[],
GitalyServer
:
{
address:
Gitlab
::
GitalyClient
.
address
(
project
.
repository_storage
),
token:
Gitlab
::
GitalyClient
.
token
(
project
.
repository_storage
)
token:
Gitlab
::
GitalyClient
.
token
(
project
.
repository_storage
),
features:
Feature
::
Gitaly
.
server_feature_flags
}
}
...
...
@@ -250,7 +251,8 @@ module Gitlab
def
gitaly_server_hash
(
repository
)
{
address:
Gitlab
::
GitalyClient
.
address
(
repository
.
project
.
repository_storage
),
token:
Gitlab
::
GitalyClient
.
token
(
repository
.
project
.
repository_storage
)
token:
Gitlab
::
GitalyClient
.
token
(
repository
.
project
.
repository_storage
),
features:
Feature
::
Gitaly
.
server_feature_flags
}
end
...
...
spec/lib/gitlab/workhorse_spec.rb
浏览文件 @
85d88d67
...
...
@@ -14,6 +14,12 @@ describe Gitlab::Workhorse do
[
key
,
command
,
params
]
end
before
do
allow
(
Feature
::
Gitaly
).
to
receive
(
:server_feature_flags
).
and_return
({
'gitaly-feature-foobar'
=>
'true'
})
end
describe
".send_git_archive"
do
let
(
:ref
)
{
'master'
}
let
(
:format
)
{
'zip'
}
...
...
@@ -41,6 +47,7 @@ describe Gitlab::Workhorse do
expected_params
=
metadata
.
merge
(
'GitalyRepository'
=>
repository
.
gitaly_repository
.
to_h
,
'GitalyServer'
=>
{
features:
{
'gitaly-feature-foobar'
=>
'true'
},
address:
Gitlab
::
GitalyClient
.
address
(
project
.
repository_storage
),
token:
Gitlab
::
GitalyClient
.
token
(
project
.
repository_storage
)
}
...
...
@@ -69,6 +76,7 @@ describe Gitlab::Workhorse do
expect
(
command
).
to
eq
(
'git-archive'
)
expect
(
params
).
to
eq
({
'GitalyServer'
=>
{
features:
{
'gitaly-feature-foobar'
=>
'true'
},
address:
Gitlab
::
GitalyClient
.
address
(
project
.
repository_storage
),
token:
Gitlab
::
GitalyClient
.
token
(
project
.
repository_storage
)
},
...
...
@@ -117,6 +125,7 @@ describe Gitlab::Workhorse do
expect
(
command
).
to
eq
(
"git-format-patch"
)
expect
(
params
).
to
eq
({
'GitalyServer'
=>
{
features:
{
'gitaly-feature-foobar'
=>
'true'
},
address:
Gitlab
::
GitalyClient
.
address
(
project
.
repository_storage
),
token:
Gitlab
::
GitalyClient
.
token
(
project
.
repository_storage
)
},
...
...
@@ -178,6 +187,7 @@ describe Gitlab::Workhorse do
expect
(
command
).
to
eq
(
"git-diff"
)
expect
(
params
).
to
eq
({
'GitalyServer'
=>
{
features:
{
'gitaly-feature-foobar'
=>
'true'
},
address:
Gitlab
::
GitalyClient
.
address
(
project
.
repository_storage
),
token:
Gitlab
::
GitalyClient
.
token
(
project
.
repository_storage
)
},
...
...
@@ -315,6 +325,7 @@ describe Gitlab::Workhorse do
let
(
:gitaly_params
)
do
{
GitalyServer
:
{
features:
{
'gitaly-feature-foobar'
=>
'true'
},
address:
Gitlab
::
GitalyClient
.
address
(
'default'
),
token:
Gitlab
::
GitalyClient
.
token
(
'default'
)
}
...
...
@@ -463,6 +474,7 @@ describe Gitlab::Workhorse do
expect
(
command
).
to
eq
(
'git-blob'
)
expect
(
params
).
to
eq
({
'GitalyServer'
=>
{
features:
{
'gitaly-feature-foobar'
=>
'true'
},
address:
Gitlab
::
GitalyClient
.
address
(
project
.
repository_storage
),
token:
Gitlab
::
GitalyClient
.
token
(
project
.
repository_storage
)
},
...
...
@@ -504,6 +516,7 @@ describe Gitlab::Workhorse do
expect
(
command
).
to
eq
(
'git-snapshot'
)
expect
(
params
).
to
eq
(
'GitalyServer'
=>
{
'features'
=>
{
'gitaly-feature-foobar'
=>
'true'
},
'address'
=>
Gitlab
::
GitalyClient
.
address
(
project
.
repository_storage
),
'token'
=>
Gitlab
::
GitalyClient
.
token
(
project
.
repository_storage
)
},
...
...
spec/requests/api/project_snapshots_spec.rb
浏览文件 @
85d88d67
...
...
@@ -6,6 +6,12 @@ describe API::ProjectSnapshots do
let
(
:project
)
{
create
(
:project
)
}
let
(
:admin
)
{
create
(
:admin
)
}
before
do
allow
(
Feature
::
Gitaly
).
to
receive
(
:server_feature_flags
).
and_return
({
'gitaly-feature-foobar'
=>
'true'
})
end
describe
'GET /projects/:id/snapshot'
do
def
expect_snapshot_response_for
(
repository
)
type
,
params
=
workhorse_send_data
...
...
@@ -13,6 +19,7 @@ describe API::ProjectSnapshots do
expect
(
type
).
to
eq
(
'git-snapshot'
)
expect
(
params
).
to
eq
(
'GitalyServer'
=>
{
'features'
=>
{
'gitaly-feature-foobar'
=>
'true'
},
'address'
=>
Gitlab
::
GitalyClient
.
address
(
repository
.
project
.
repository_storage
),
'token'
=>
Gitlab
::
GitalyClient
.
token
(
repository
.
project
.
repository_storage
)
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录