Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e63cbf4e
Commit
e63cbf4e
authored
Oct 11, 2018
by
Filipa Lacerda
Committed by
Tim Zallmann
Oct 11, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stuck block URL links to runners settings
parent
3ff2e1bb
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
5 deletions
+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
No files found.
app/assets/javascripts/jobs/components/job_app.vue
View file @
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
View file @
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
View file @
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
View file @
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
View file @
e63cbf4e
...
...
@@ -41,7 +41,7 @@ describe('Job App ', () => {
};
const
props
=
{
runner
HelpUrl
:
'
help
/runners
'
,
runner
SettingsUrl
:
'
settings/ci-cd
/runners
'
,
};
beforeEach
(()
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment