Merge branch '45666-project-ci-lint-links' into 'master'
Update links to /ci/lint with a new project's ci/lint Closes #45666 See merge request gitlab-org/gitlab-ce!18539
This commit is contained in:
commit
81e80ae951
4 changed files with 8 additions and 3 deletions
|
@ -15,7 +15,7 @@
|
||||||
- unless @repository.gitlab_ci_yml
|
- unless @repository.gitlab_ci_yml
|
||||||
= link_to 'Get started with Pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info'
|
= link_to 'Get started with Pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info'
|
||||||
|
|
||||||
= link_to ci_lint_path, class: 'btn btn-default' do
|
= link_to project_ci_lint_path(@project), class: 'btn btn-default' do
|
||||||
%span CI lint
|
%span CI lint
|
||||||
|
|
||||||
.content-list.builds-content-list
|
.content-list.builds-content-list
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
%ul
|
%ul
|
||||||
- pipeline.yaml_errors.split(",").each do |error|
|
- pipeline.yaml_errors.split(",").each do |error|
|
||||||
%li= error
|
%li= error
|
||||||
You can also test your .gitlab-ci.yml in the #{link_to "Lint", ci_lint_path}
|
You can also test your .gitlab-ci.yml in the #{link_to "Lint", project_ci_lint_path(@project)}
|
||||||
|
|
||||||
- if pipeline.project.builds_enabled? && !pipeline.ci_yaml_file
|
- if pipeline.project.builds_enabled? && !pipeline.ci_yaml_file
|
||||||
.bs-callout.bs-callout-warning
|
.bs-callout.bs-callout-warning
|
||||||
|
|
5
changelogs/unreleased/45666-project-ci-lint-links.yml
Normal file
5
changelogs/unreleased/45666-project-ci-lint-links.yml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Update links to /ci/lint with ones to project ci/lint
|
||||||
|
merge_request: 18539
|
||||||
|
author: Takuya Noguchi
|
||||||
|
type: fixed
|
|
@ -26,7 +26,7 @@ describe 'User browses jobs' do
|
||||||
page.within('.nav-controls') do
|
page.within('.nav-controls') do
|
||||||
ci_lint_tool_link = page.find_link('CI lint')
|
ci_lint_tool_link = page.find_link('CI lint')
|
||||||
|
|
||||||
expect(ci_lint_tool_link[:href]).to end_with(ci_lint_path)
|
expect(ci_lint_tool_link[:href]).to end_with(project_ci_lint_path(project))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue