Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f675c7d4
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 搜索 >>
提交
f675c7d4
编写于
9月 07, 2020
作者:
G
GitLab Bot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add latest changes from gitlab-org/gitlab@master
上级
0574192d
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
77 addition
and
17 deletion
+77
-17
app/assets/javascripts/boards/components/modal/footer.vue
app/assets/javascripts/boards/components/modal/footer.vue
+6
-4
app/assets/javascripts/jobs/components/artifacts_block.vue
app/assets/javascripts/jobs/components/artifacts_block.vue
+14
-1
app/assets/javascripts/jobs/components/job_app.vue
app/assets/javascripts/jobs/components/job_app.vue
+6
-0
app/assets/javascripts/jobs/components/sidebar.vue
app/assets/javascripts/jobs/components/sidebar.vue
+6
-1
app/assets/javascripts/jobs/index.js
app/assets/javascripts/jobs/index.js
+2
-0
app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list_item.vue
...s/projects/forks/new/components/fork_groups_list_item.vue
+3
-2
app/assets/stylesheets/framework/tables.scss
app/assets/stylesheets/framework/tables.scss
+1
-1
app/helpers/ci/jobs_helper.rb
app/helpers/ci/jobs_helper.rb
+1
-0
changelogs/unreleased/233425-add-artifact-expiration-help-url.yml
...gs/unreleased/233425-add-artifact-expiration-help-url.yml
+5
-0
changelogs/unreleased/241851-Replace-v-html.yml
changelogs/unreleased/241851-Replace-v-html.yml
+5
-0
lib/object_storage/direct_upload.rb
lib/object_storage/direct_upload.rb
+7
-4
spec/frontend/jobs/components/artifacts_block_spec.js
spec/frontend/jobs/components/artifacts_block_spec.js
+16
-1
spec/frontend/jobs/components/job_app_spec.js
spec/frontend/jobs/components/job_app_spec.js
+1
-0
spec/lib/backup/repository_spec.rb
spec/lib/backup/repository_spec.rb
+1
-1
spec/lib/object_storage/direct_upload_spec.rb
spec/lib/object_storage/direct_upload_spec.rb
+3
-2
未找到文件。
app/assets/javascripts/boards/components/modal/footer.vue
浏览文件 @
f675c7d4
<
script
>
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
footerEEMixin
from
'
ee_else_ce/boards/mixins/modal_footer
'
;
import
{
deprecatedCreateFlash
as
Flash
}
from
'
../../../flash
'
;
import
{
__
,
n__
}
from
'
../../../locale
'
;
...
...
@@ -10,6 +11,7 @@ import boardsStore from '../../stores/boards_store';
export
default
{
components
:
{
ListsDropdown
,
GlButton
,
},
mixins
:
[
modalMixin
,
footerEEMixin
],
data
()
{
...
...
@@ -65,14 +67,14 @@ export default {
<
template
>
<footer
class=
"form-actions add-issues-footer"
>
<div
class=
"float-left"
>
<
button
:disabled=
"submitDisabled"
class=
"btn btn-success"
type=
"button
"
@
click=
"addIssues"
>
<
gl-button
:disabled=
"submitDisabled"
category=
"primary"
variant=
"success
"
@
click=
"addIssues"
>
{{
submitText
}}
</button>
</
gl-
button>
<span
class=
"inline add-issues-footer-to-list"
>
{{
__
(
'
to list
'
)
}}
</span>
<lists-dropdown
/>
</div>
<
button
class=
"btn btn-default float-right"
type=
"button
"
@
click=
"toggleModal(false)"
>
<
gl-button
class=
"float-right
"
@
click=
"toggleModal(false)"
>
{{
__
(
'
Cancel
'
)
}}
</button>
</
gl-
button>
</footer>
</
template
>
app/assets/javascripts/jobs/components/artifacts_block.vue
浏览文件 @
f675c7d4
<
script
>
import
{
GlLink
}
from
'
@gitlab/ui
'
;
import
{
Gl
Icon
,
Gl
Link
}
from
'
@gitlab/ui
'
;
import
TimeagoTooltip
from
'
~/vue_shared/components/time_ago_tooltip.vue
'
;
import
timeagoMixin
from
'
~/vue_shared/mixins/timeago
'
;
export
default
{
components
:
{
TimeagoTooltip
,
GlIcon
,
GlLink
,
},
mixins
:
[
timeagoMixin
],
...
...
@@ -14,6 +15,10 @@ export default {
type
:
Object
,
required
:
true
,
},
helpUrl
:
{
type
:
String
,
required
:
true
,
},
},
computed
:
{
isExpired
()
{
...
...
@@ -40,6 +45,14 @@ export default {
<span
v-if=
"isExpired"
>
{{
s__
(
'
Job|The artifacts were removed
'
)
}}
</span>
<span
v-if=
"willExpire"
>
{{
s__
(
'
Job|The artifacts will be removed
'
)
}}
</span>
<timeago-tooltip
v-if=
"artifact.expire_at"
:time=
"artifact.expire_at"
/>
<gl-link
:href=
"helpUrl"
target=
"_blank"
rel=
"noopener noreferrer nofollow"
data-testid=
"artifact-expired-help-link"
>
<gl-icon
name=
"question"
/>
</gl-link>
</p>
<p
v-else-if=
"isLocked"
class=
"build-detail-row"
>
<span
data-testid=
"job-locked-message"
>
{{
...
...
app/assets/javascripts/jobs/components/job_app.vue
浏览文件 @
f675c7d4
...
...
@@ -38,6 +38,11 @@ export default {
},
mixins
:
[
delayedJobMixin
],
props
:
{
artifactHelpUrl
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
runnerSettingsUrl
:
{
type
:
String
,
required
:
false
,
...
...
@@ -319,6 +324,7 @@ export default {
'right-sidebar-expanded': isSidebarOpen,
'right-sidebar-collapsed': !isSidebarOpen,
}"
:artifact-help-url=
"artifactHelpUrl"
:runner-help-url=
"runnerHelpUrl"
data-testid=
"job-sidebar"
/>
...
...
app/assets/javascripts/jobs/components/sidebar.vue
浏览文件 @
f675c7d4
...
...
@@ -29,6 +29,11 @@ export default {
},
mixins
:
[
timeagoMixin
],
props
:
{
artifactHelpUrl
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
runnerHelpUrl
:
{
type
:
String
,
required
:
false
,
...
...
@@ -208,7 +213,7 @@ export default {
</p>
</div>
<artifacts-block
v-if=
"hasArtifact"
:artifact=
"job.artifact"
/>
<artifacts-block
v-if=
"hasArtifact"
:artifact=
"job.artifact"
:help-url=
"artifactHelpUrl"
/>
<trigger-block
v-if=
"hasTriggers"
:trigger=
"job.trigger"
/>
<commit-block
:is-last-block=
"hasStages"
...
...
app/assets/javascripts/jobs/index.js
浏览文件 @
f675c7d4
...
...
@@ -18,6 +18,7 @@ export default () => {
},
render
(
createElement
)
{
const
{
artifactHelpUrl
,
deploymentHelpUrl
,
runnerHelpUrl
,
runnerSettingsUrl
,
...
...
@@ -32,6 +33,7 @@ export default () => {
return
createElement
(
'
job-app
'
,
{
props
:
{
artifactHelpUrl
,
deploymentHelpUrl
,
runnerHelpUrl
,
runnerSettingsUrl
,
...
...
app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list_item.vue
浏览文件 @
f675c7d4
<
script
>
/* eslint-disable vue/no-v-html */
import
{
GlLink
,
GlButton
,
...
...
@@ -8,6 +7,7 @@ import {
GlTooltipDirective
,
GlTooltip
,
GlBadge
,
GlSafeHtmlDirective
as
SafeHtml
,
}
from
'
@gitlab/ui
'
;
import
{
VISIBILITY_TYPE_ICON
,
GROUP_VISIBILITY_TYPE
}
from
'
~/groups/constants
'
;
import
{
__
}
from
'
~/locale
'
;
...
...
@@ -24,6 +24,7 @@ export default {
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
SafeHtml
,
},
props
:
{
group
:
{
...
...
@@ -120,7 +121,7 @@ export default {
</span>
</div>
<div
v-if=
"group.description"
class=
"description"
>
<span
v-html=
"group.markdown_description"
>
</span>
<span
v-
safe-
html=
"group.markdown_description"
>
</span>
</div>
</div>
<div
class=
"gl-display-flex gl-flex-shrink-0"
>
...
...
app/assets/stylesheets/framework/tables.scss
浏览文件 @
f675c7d4
...
...
@@ -198,7 +198,7 @@ table {
}
.severity
{
width
:
9
%
;
width
:
10
%
;
}
.identifier
{
...
...
app/helpers/ci/jobs_helper.rb
浏览文件 @
f675c7d4
...
...
@@ -6,6 +6,7 @@ module Ci
{
"endpoint"
=>
project_job_path
(
@project
,
@build
,
format: :json
),
"project_path"
=>
@project
.
full_path
,
"artifact_help_url"
=>
help_page_path
(
'user/gitlab_com/index.html'
,
anchor:
'gitlab-cicd'
),
"deployment_help_url"
=>
help_page_path
(
'user/project/clusters/index.html'
,
anchor:
'troubleshooting'
),
"runner_help_url"
=>
help_page_path
(
'ci/runners/README.html'
,
anchor:
'set-maximum-job-timeout-for-a-runner'
),
"runner_settings_url"
=>
project_runners_path
(
@build
.
project
,
anchor:
'js-runners-settings'
),
...
...
changelogs/unreleased/233425-add-artifact-expiration-help-url.yml
0 → 100644
浏览文件 @
f675c7d4
---
title
:
Add the artifact expiration help url
merge_request
:
39546
author
:
Gilang Gumilar
type
:
added
changelogs/unreleased/241851-Replace-v-html.yml
0 → 100644
浏览文件 @
f675c7d4
---
title
:
Replace v-html with v-safe-html in fork_groups_list_item.vue
merge_request
:
41143
author
:
Kev @KevSlashNull
type
:
other
lib/object_storage/direct_upload.rb
浏览文件 @
f675c7d4
...
...
@@ -98,16 +98,19 @@ module ObjectStorage
RemoteTempObjectID
:
object_name
,
ObjectStorage
:
{
Provider
:
'AzureRM'
,
AzureConfig
:
{
StorageDomain
:
config
.
azure_storage_domain
},
GoCloudConfig
:
{
URL
:
"azblob://
#{
bucket_name
}
"
URL
:
azure_gocloud_url
}
}
}
end
def
azure_gocloud_url
url
=
"azblob://
#{
bucket_name
}
"
url
+=
"?domain=
#{
config
.
azure_storage_domain
}
"
if
config
.
azure_storage_domain
.
present?
url
end
def
use_workhorse_s3_client?
return
false
unless
Feature
.
enabled?
(
:use_workhorse_s3_client
,
default_enabled:
true
)
return
false
unless
config
.
use_iam_profile?
||
config
.
consolidated_settings?
...
...
spec/frontend/jobs/components/artifacts_block_spec.js
浏览文件 @
f675c7d4
...
...
@@ -8,7 +8,10 @@ describe('Artifacts block', () => {
const
createWrapper
=
propsData
=>
mount
(
ArtifactsBlock
,
{
propsData
,
propsData
:
{
helpUrl
:
'
help-url
'
,
...
propsData
,
},
});
const
findArtifactRemoveElt
=
()
=>
wrapper
.
find
(
'
[data-testid="artifacts-remove-timeline"]
'
);
...
...
@@ -68,6 +71,12 @@ describe('Artifacts block', () => {
expect
(
trimText
(
findArtifactRemoveElt
().
text
())).
toBe
(
`The artifacts were removed
${
formattedDate
}
`
,
);
expect
(
findArtifactRemoveElt
()
.
find
(
'
[data-testid="artifact-expired-help-link"]
'
)
.
attributes
(
'
href
'
),
).
toBe
(
'
help-url
'
);
});
it
(
'
does not show the keep button
'
,
()
=>
{
...
...
@@ -94,6 +103,12 @@ describe('Artifacts block', () => {
expect
(
trimText
(
findArtifactRemoveElt
().
text
())).
toBe
(
`The artifacts will be removed
${
formattedDate
}
`
,
);
expect
(
findArtifactRemoveElt
()
.
find
(
'
[data-testid="artifact-expired-help-link"]
'
)
.
attributes
(
'
href
'
),
).
toBe
(
'
help-url
'
);
});
it
(
'
renders the keep button
'
,
()
=>
{
...
...
spec/frontend/jobs/components/job_app_spec.js
浏览文件 @
f675c7d4
...
...
@@ -33,6 +33,7 @@ describe('Job App', () => {
};
const
props
=
{
artifactHelpUrl
:
'
help/artifact
'
,
runnerHelpUrl
:
'
help/runner
'
,
deploymentHelpUrl
:
'
help/deployment
'
,
runnerSettingsUrl
:
'
settings/ci-cd/runners
'
,
...
...
spec/lib/backup/repository_spec.rb
浏览文件 @
f675c7d4
...
...
@@ -67,7 +67,7 @@ RSpec.describe Backup::Repository do
end
[
4
,
10
].
each
do
|
max_storage_concurrency
|
context
"max_storage_concurrency
#{
max_storage_concurrency
}
"
do
context
"max_storage_concurrency
#{
max_storage_concurrency
}
"
,
quarantine:
'https://gitlab.com/gitlab-org/gitlab/-/issues/241701'
do
it
'creates the expected number of threads'
do
expect
(
Thread
).
to
receive
(
:new
)
.
exactly
(
storage_keys
.
length
*
(
max_storage_concurrency
+
1
)).
times
...
...
spec/lib/object_storage/direct_upload_spec.rb
浏览文件 @
f675c7d4
...
...
@@ -211,8 +211,7 @@ RSpec.describe ObjectStorage::DirectUpload do
expect
(
subject
[
:UseWorkhorseClient
]).
to
be
true
expect
(
subject
[
:RemoteTempObjectID
]).
to
eq
(
object_name
)
expect
(
subject
[
:ObjectStorage
][
:Provider
]).
to
eq
(
'AzureRM'
)
expect
(
subject
[
:ObjectStorage
][
:AzureConfig
][
:StorageDomain
]).
to
eq
(
storage_domain
)
expect
(
subject
[
:ObjectStorage
][
:GoCloudConfig
]).
to
eq
({
URL
:
"azblob://
#{
bucket_name
}
"
})
expect
(
subject
[
:ObjectStorage
][
:GoCloudConfig
]).
to
eq
({
URL
:
gocloud_url
})
end
end
...
...
@@ -399,6 +398,7 @@ RSpec.describe ObjectStorage::DirectUpload do
let
(
:has_length
)
{
false
}
let
(
:storage_domain
)
{
nil
}
let
(
:storage_url
)
{
'https://azuretest.blob.core.windows.net'
}
let
(
:gocloud_url
)
{
"azblob://
#{
bucket_name
}
"
}
it_behaves_like
'a valid AzureRM upload'
it_behaves_like
'a valid upload without multipart data'
...
...
@@ -406,6 +406,7 @@ RSpec.describe ObjectStorage::DirectUpload do
context
'when a custom storage domain is used'
do
let
(
:storage_domain
)
{
'blob.core.chinacloudapi.cn'
}
let
(
:storage_url
)
{
"https://azuretest.
#{
storage_domain
}
"
}
let
(
:gocloud_url
)
{
"azblob://
#{
bucket_name
}
?domain=
#{
storage_domain
}
"
}
before
do
credentials
[
:azure_storage_domain
]
=
storage_domain
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录