Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3c0be3cd
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 搜索 >>
未验证
提交
3c0be3cd
编写于
10月 20, 2017
作者:
N
Nick Thomas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix the external URLs generated for online view of HTML artifacts
上级
e1122c9f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
10 deletion
+19
-10
app/models/ci/artifact_blob.rb
app/models/ci/artifact_blob.rb
+11
-6
changelogs/unreleased/39189-online-view-of-html-artifacts-is-broken.yml
...eleased/39189-online-view-of-html-artifacts-is-broken.yml
+5
-0
spec/models/ci/artifact_blob_spec.rb
spec/models/ci/artifact_blob_spec.rb
+3
-4
未找到文件。
app/models/ci/artifact_blob.rb
浏览文件 @
3c0be3cd
...
...
@@ -2,7 +2,7 @@ module Ci
class
ArtifactBlob
include
BlobLike
EXTEN
T
IONS_SERVED_BY_PAGES
=
%w[.html .htm .txt .json]
.
freeze
EXTEN
S
IONS_SERVED_BY_PAGES
=
%w[.html .htm .txt .json]
.
freeze
attr_reader
:entry
...
...
@@ -36,17 +36,22 @@ module Ci
def
external_url
(
project
,
job
)
return
unless
external_link?
(
job
)
components
=
project
.
full_path_components
components
<<
"-/jobs/
#{
job
.
id
}
/artifacts/file/
#{
path
}
"
artifact_path
=
components
[
1
..-
1
].
join
(
'/'
)
full_path_parts
=
project
.
full_path_components
top_level_group
=
full_path_parts
.
shift
"
#{
pages_config
.
protocol
}
://
#{
components
[
0
]
}
.
#{
pages_config
.
host
}
/
#{
artifact_path
}
"
artifact_path
=
[
'-'
,
*
full_path_parts
,
'-'
,
'jobs'
,
job
.
id
,
'artifacts'
,
path
].
join
(
'/'
)
"
#{
pages_config
.
protocol
}
://
#{
top_level_group
}
.
#{
pages_config
.
host
}
/
#{
artifact_path
}
"
end
def
external_link?
(
job
)
pages_config
.
enabled
&&
pages_config
.
artifacts_server
&&
EXTEN
T
IONS_SERVED_BY_PAGES
.
include?
(
File
.
extname
(
name
))
&&
EXTEN
S
IONS_SERVED_BY_PAGES
.
include?
(
File
.
extname
(
name
))
&&
job
.
project
.
public?
end
...
...
changelogs/unreleased/39189-online-view-of-html-artifacts-is-broken.yml
0 → 100644
浏览文件 @
3c0be3cd
---
title
:
Fix the external URLs generated for online view of HTML artifacts
merge_request
:
14977
author
:
type
:
fixed
spec/models/ci/artifact_blob_spec.rb
浏览文件 @
3c0be3cd
...
...
@@ -56,15 +56,14 @@ describe Ci::ArtifactBlob do
end
context
'txt extensions'
do
let
(
:entry
)
{
build
.
artifacts_metadata_entry
(
'other_artifacts_0.1.2/doc_sample.txt'
)
}
let
(
:path
)
{
'other_artifacts_0.1.2/doc_sample.txt'
}
let
(
:entry
)
{
build
.
artifacts_metadata_entry
(
path
)
}
it
'returns a URL'
do
url
=
subject
.
external_url
(
build
.
project
,
build
)
expect
(
url
).
not_to
be_nil
expect
(
url
).
to
start_with
(
"http"
)
expect
(
url
).
to
match
Gitlab
.
config
.
pages
.
host
expect
(
url
).
to
end_with
(
entry
.
path
)
expect
(
url
).
to
eq
(
"http://
#{
project
.
namespace
.
path
}
.
#{
Gitlab
.
config
.
pages
.
host
}
/-/
#{
project
.
path
}
/-/jobs/
#{
build
.
id
}
/artifacts/
#{
path
}
"
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录