Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e63cbf4e
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,发现更多精彩内容 >>
提交
e63cbf4e
编写于
10月 11, 2018
作者:
F
Filipa Lacerda
提交者:
Tim Zallmann
10月 11, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Stuck block URL links to runners settings
上级
3ff2e1bb
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
12 addition
and
5 deletion
+12
-5
app/assets/javascripts/jobs/components/job_app.vue
app/assets/javascripts/jobs/components/job_app.vue
+2
-2
app/assets/javascripts/jobs/job_details_bundle.js
app/assets/javascripts/jobs/job_details_bundle.js
+1
-1
app/views/projects/jobs/show.html.haml
app/views/projects/jobs/show.html.haml
+3
-1
changelogs/unreleased/52519-runners-link.yml
changelogs/unreleased/52519-runners-link.yml
+5
-0
spec/javascripts/jobs/components/job_app_spec.js
spec/javascripts/jobs/components/job_app_spec.js
+1
-1
未找到文件。
app/assets/javascripts/jobs/components/job_app.vue
浏览文件 @
e63cbf4e
...
...
@@ -18,7 +18,7 @@
StuckBlock
,
},
props
:
{
runner
Help
Url
:
{
runner
Settings
Url
:
{
type
:
String
,
required
:
false
,
default
:
null
,
...
...
@@ -76,7 +76,7 @@
class=
"js-job-stuck"
:has-no-runners-for-project=
"job.runners.available"
:tags=
"job.tags"
:runners-path=
"runner
Help
Url"
:runners-path=
"runner
Settings
Url"
/>
<environments-block
...
...
app/assets/javascripts/jobs/job_details_bundle.js
浏览文件 @
e63cbf4e
...
...
@@ -33,7 +33,7 @@ export default () => {
props
:
{
isLoading
:
this
.
isLoading
,
job
:
this
.
job
,
runner
HelpUrl
:
dataset
.
runnerHelp
Url
,
runner
SettingsUrl
:
dataset
.
runnerSettings
Url
,
},
});
},
...
...
app/views/projects/jobs/show.html.haml
浏览文件 @
e63cbf4e
...
...
@@ -47,4 +47,6 @@
.js-build-options
{
data:
javascript_build_options
}
#js-job-details-vue
{
data:
{
endpoint:
project_job_path
(
@project
,
@build
,
format: :json
),
runner_help_url:
help_page_path
(
'ci/runners/README.html'
,
anchor:
'setting-maximum-job-timeout-for-a-runner'
)
}
}
#js-job-details-vue
{
data:
{
endpoint:
project_job_path
(
@project
,
@build
,
format: :json
),
runner_help_url:
help_page_path
(
'ci/runners/README.html'
,
anchor:
'setting-maximum-job-timeout-for-a-runner'
),
runner_settings_url:
project_runners_path
(
@build
.
project
,
anchor:
'js-runners-settings'
)
}
}
changelogs/unreleased/52519-runners-link.yml
0 → 100644
浏览文件 @
e63cbf4e
---
title
:
Fixes stuck block URL linking to documentation instead of settings page
merge_request
:
22286
author
:
type
:
fixed
spec/javascripts/jobs/components/job_app_spec.js
浏览文件 @
e63cbf4e
...
...
@@ -41,7 +41,7 @@ describe('Job App ', () => {
};
const
props
=
{
runner
HelpUrl
:
'
help
/runners
'
,
runner
SettingsUrl
:
'
settings/ci-cd
/runners
'
,
};
beforeEach
(()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录