Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
1646149f
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 搜索 >>
提交
1646149f
编写于
5月 28, 2020
作者:
G
GitLab Bot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
上级
4467fbd0
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
44 addition
and
2 deletion
+44
-2
app/controllers/projects/artifacts_controller.rb
app/controllers/projects/artifacts_controller.rb
+10
-2
changelogs/unreleased/218557-geo-design-thumbnails-are-not-replicated.yml
...eased/218557-geo-design-thumbnails-are-not-replicated.yml
+5
-0
changelogs/unreleased/sh-fix-artifacts-download-404.yml
changelogs/unreleased/sh-fix-artifacts-download-404.yml
+5
-0
spec/controllers/projects/artifacts_controller_spec.rb
spec/controllers/projects/artifacts_controller_spec.rb
+18
-0
spec/features/projects/artifacts/user_downloads_artifacts_spec.rb
...tures/projects/artifacts/user_downloads_artifacts_spec.rb
+6
-0
未找到文件。
app/controllers/projects/artifacts_controller.rb
浏览文件 @
1646149f
...
...
@@ -111,7 +111,7 @@ class Projects::ArtifactsController < Projects::ApplicationController
def
build
@build
||=
begin
build
=
build_from_id
||
build_from_ref
build
=
build_from_id
||
build_from_
sha
||
build_from_
ref
build
&
.
present
(
current_user:
current_user
)
end
end
...
...
@@ -125,7 +125,8 @@ class Projects::ArtifactsController < Projects::ApplicationController
project
.
builds
.
find_by_id
(
params
[
:job_id
])
if
params
[
:job_id
]
end
def
build_from_ref
def
build_from_sha
return
if
params
[
:job
].
blank?
return
unless
@ref_name
commit
=
project
.
commit
(
@ref_name
)
...
...
@@ -134,6 +135,13 @@ class Projects::ArtifactsController < Projects::ApplicationController
project
.
latest_successful_build_for_sha
(
params
[
:job
],
commit
.
id
)
end
def
build_from_ref
return
if
params
[
:job
].
blank?
return
unless
@ref_name
project
.
latest_successful_build_for_ref
(
params
[
:job
],
@ref_name
)
end
def
artifacts_file
@artifacts_file
||=
build
&
.
artifacts_file_for_type
(
params
[
:file_type
]
||
:archive
)
end
...
...
changelogs/unreleased/218557-geo-design-thumbnails-are-not-replicated.yml
0 → 100644
浏览文件 @
1646149f
---
title
:
Fix Geo replication for design thumbnails
merge_request
:
32703
author
:
type
:
fixed
changelogs/unreleased/sh-fix-artifacts-download-404.yml
0 → 100644
浏览文件 @
1646149f
---
title
:
Fix 404s downloading build artifacts
merge_request
:
32741
author
:
type
:
fixed
spec/controllers/projects/artifacts_controller_spec.rb
浏览文件 @
1646149f
...
...
@@ -3,6 +3,8 @@
require
'spec_helper'
describe
Projects
::
ArtifactsController
do
include
RepoHelpers
let
(
:user
)
{
project
.
owner
}
let_it_be
(
:project
)
{
create
(
:project
,
:repository
,
:public
)
}
...
...
@@ -447,6 +449,22 @@ describe Projects::ArtifactsController do
expect
(
response
).
to
redirect_to
(
path
)
end
end
context
'with a failed pipeline on an updated master'
do
before
do
create_file_in_repo
(
project
,
'master'
,
'master'
,
'test.txt'
,
'This is test'
)
create
(
:ci_pipeline
,
project:
project
,
sha:
project
.
commit
.
sha
,
ref:
project
.
default_branch
,
status:
'failed'
)
get
:latest_succeeded
,
params:
params_from_ref
(
project
.
default_branch
)
end
it_behaves_like
'redirect to the job'
end
end
end
end
spec/features/projects/artifacts/user_downloads_artifacts_spec.rb
浏览文件 @
1646149f
...
...
@@ -32,5 +32,11 @@ describe "User downloads artifacts" do
it_behaves_like
"downloading"
end
context
"via SHA"
do
let
(
:url
)
{
latest_succeeded_project_artifacts_path
(
project
,
"
#{
pipeline
.
sha
}
/download"
,
job:
job
.
name
)
}
it_behaves_like
"downloading"
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录