Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
527f87df
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,发现更多精彩内容 >>
未验证
提交
527f87df
编写于
10月 12, 2017
作者:
N
Nick Thomas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support show-all-refs for git over HTTP
上级
2d5c4532
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
25 addition
and
5 deletion
+25
-5
GITLAB_WORKHORSE_VERSION
GITLAB_WORKHORSE_VERSION
+1
-1
changelogs/unreleased/backport-workhorse-show-all-refs.yml
changelogs/unreleased/backport-workhorse-show-all-refs.yml
+5
-0
lib/gitlab/workhorse.rb
lib/gitlab/workhorse.rb
+3
-2
spec/lib/gitlab/workhorse_spec.rb
spec/lib/gitlab/workhorse_spec.rb
+16
-2
未找到文件。
GITLAB_WORKHORSE_VERSION
浏览文件 @
527f87df
3.
2
.0
3.
3
.0
changelogs/unreleased/backport-workhorse-show-all-refs.yml
0 → 100644
浏览文件 @
527f87df
---
title
:
Support show-all-refs for git over HTTP
merge_request
:
14834
author
:
type
:
added
lib/gitlab/workhorse.rb
浏览文件 @
527f87df
...
@@ -16,14 +16,15 @@ module Gitlab
...
@@ -16,14 +16,15 @@ module Gitlab
SECRET_LENGTH
=
32
SECRET_LENGTH
=
32
class
<<
self
class
<<
self
def
git_http_ok
(
repository
,
is_wiki
,
user
,
action
)
def
git_http_ok
(
repository
,
is_wiki
,
user
,
action
,
show_all_refs:
false
)
project
=
repository
.
project
project
=
repository
.
project
repo_path
=
repository
.
path_to_repo
repo_path
=
repository
.
path_to_repo
params
=
{
params
=
{
GL_ID
:
Gitlab
::
GlId
.
gl_id
(
user
),
GL_ID
:
Gitlab
::
GlId
.
gl_id
(
user
),
GL_REPOSITORY
:
Gitlab
::
GlRepository
.
gl_repository
(
project
,
is_wiki
),
GL_REPOSITORY
:
Gitlab
::
GlRepository
.
gl_repository
(
project
,
is_wiki
),
GL_USERNAME
:
user
&
.
username
,
GL_USERNAME
:
user
&
.
username
,
RepoPath
:
repo_path
RepoPath
:
repo_path
,
ShowAllRefs
:
show_all_refs
}
}
server
=
{
server
=
{
address:
Gitlab
::
GitalyClient
.
address
(
project
.
repository_storage
),
address:
Gitlab
::
GitalyClient
.
address
(
project
.
repository_storage
),
...
...
spec/lib/gitlab/workhorse_spec.rb
浏览文件 @
527f87df
...
@@ -268,7 +268,8 @@ describe Gitlab::Workhorse do
...
@@ -268,7 +268,8 @@ describe Gitlab::Workhorse do
GL_ID
:
"user-
#{
user
.
id
}
"
,
GL_ID
:
"user-
#{
user
.
id
}
"
,
GL_USERNAME
:
user
.
username
,
GL_USERNAME
:
user
.
username
,
GL_REPOSITORY
:
"project-
#{
project
.
id
}
"
,
GL_REPOSITORY
:
"project-
#{
project
.
id
}
"
,
RepoPath
:
repo_path
RepoPath
:
repo_path
,
ShowAllRefs
:
false
}
}
end
end
...
@@ -282,7 +283,8 @@ describe Gitlab::Workhorse do
...
@@ -282,7 +283,8 @@ describe Gitlab::Workhorse do
GL_ID
:
"user-
#{
user
.
id
}
"
,
GL_ID
:
"user-
#{
user
.
id
}
"
,
GL_USERNAME
:
user
.
username
,
GL_USERNAME
:
user
.
username
,
GL_REPOSITORY
:
"wiki-
#{
project
.
id
}
"
,
GL_REPOSITORY
:
"wiki-
#{
project
.
id
}
"
,
RepoPath
:
repo_path
RepoPath
:
repo_path
,
ShowAllRefs
:
false
}
}
end
end
...
@@ -324,6 +326,12 @@ describe Gitlab::Workhorse do
...
@@ -324,6 +326,12 @@ describe Gitlab::Workhorse do
expect
(
subject
).
to
include
(
gitaly_params
)
expect
(
subject
).
to
include
(
gitaly_params
)
end
end
context
'show_all_refs enabled'
do
subject
{
described_class
.
git_http_ok
(
repository
,
false
,
user
,
action
,
show_all_refs:
true
)
}
it
{
is_expected
.
to
include
(
ShowAllRefs
:
true
)
}
end
end
end
context
"when git_receive_pack action is passed"
do
context
"when git_receive_pack action is passed"
do
...
@@ -336,6 +344,12 @@ describe Gitlab::Workhorse do
...
@@ -336,6 +344,12 @@ describe Gitlab::Workhorse do
let
(
:action
)
{
'info_refs'
}
let
(
:action
)
{
'info_refs'
}
it
{
expect
(
subject
).
to
include
(
gitaly_params
)
}
it
{
expect
(
subject
).
to
include
(
gitaly_params
)
}
context
'show_all_refs enabled'
do
subject
{
described_class
.
git_http_ok
(
repository
,
false
,
user
,
action
,
show_all_refs:
true
)
}
it
{
is_expected
.
to
include
(
ShowAllRefs
:
true
)
}
end
end
end
context
'when action passed is not supported by Gitaly'
do
context
'when action passed is not supported by Gitaly'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录