Build ci/lint page
- Includes new image from gitlab-svgs - Updates dependency for svgs
This commit is contained in:
parent
80f9aff34b
commit
02bc89983a
|
@ -1,21 +1,16 @@
|
||||||
.ci-body {
|
.ci-linter-container {
|
||||||
.incorrect-syntax {
|
align-items: center;
|
||||||
font-size: 18px;
|
display: flex;
|
||||||
color: $lint-incorrect-color;
|
height: calc(100vh - #{$header-height + $performance-bar-height});
|
||||||
|
justify-content: center;
|
||||||
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.correct-syntax {
|
.ci-linter-inner {
|
||||||
font-size: 18px;
|
width: auto;
|
||||||
color: $lint-correct-color;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.ci-linter {
|
.ci-linter-description {
|
||||||
.ci-editor {
|
color: $common-gray-light;
|
||||||
height: 400px;
|
width: 500px;
|
||||||
}
|
|
||||||
|
|
||||||
.ci-template pre {
|
|
||||||
white-space: pre-wrap;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1121,3 +1121,25 @@ pre.light-well {
|
||||||
padding-top: $gl-padding;
|
padding-top: $gl-padding;
|
||||||
padding-bottom: 37px;
|
padding-bottom: 37px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.project-ci-body {
|
||||||
|
.incorrect-syntax {
|
||||||
|
font-size: 18px;
|
||||||
|
color: $lint-incorrect-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
.correct-syntax {
|
||||||
|
font-size: 18px;
|
||||||
|
color: $lint-correct-color;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.project-ci-linter {
|
||||||
|
.ci-editor {
|
||||||
|
height: 400px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ci-template pre {
|
||||||
|
white-space: pre-wrap;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -29,12 +29,12 @@ module Projects
|
||||||
@project_runners = @project.runners.ordered
|
@project_runners = @project.runners.ordered
|
||||||
@assignable_runners = current_user.ci_authorized_runners
|
@assignable_runners = current_user.ci_authorized_runners
|
||||||
.assignable_for(project).ordered.page(params[:page]).per(20)
|
.assignable_for(project).ordered.page(params[:page]).per(20)
|
||||||
@shared_runners = Ci::Runner.shared.active
|
@shared_runners = ::Ci::Runner.shared.active
|
||||||
@shared_runners_count = @shared_runners.count(:all)
|
@shared_runners_count = @shared_runners.count(:all)
|
||||||
end
|
end
|
||||||
|
|
||||||
def define_secret_variables
|
def define_secret_variables
|
||||||
@variable = Ci::Variable.new(project: project)
|
@variable = ::Ci::Variable.new(project: project)
|
||||||
.present(current_user: current_user)
|
.present(current_user: current_user)
|
||||||
@variables = project.variables.order_key_asc
|
@variables = project.variables.order_key_asc
|
||||||
.map { |variable| variable.present(current_user: current_user) }
|
.map { |variable| variable.present(current_user: current_user) }
|
||||||
|
@ -42,7 +42,7 @@ module Projects
|
||||||
|
|
||||||
def define_triggers_variables
|
def define_triggers_variables
|
||||||
@triggers = @project.triggers
|
@triggers = @project.triggers
|
||||||
@trigger = Ci::Trigger.new
|
@trigger = ::Ci::Trigger.new
|
||||||
end
|
end
|
||||||
|
|
||||||
def define_badges_variables
|
def define_badges_variables
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
- page_title "CI Lint"
|
.ci-linter-container
|
||||||
|
.ci-linter-inner
|
||||||
.center
|
|
||||||
= image_tag 'illustrations/feature_moved.svg'
|
= image_tag 'illustrations/feature_moved.svg'
|
||||||
%h3 GitLab CI Linter has been moved
|
%h3 GitLab CI Linter has been moved
|
||||||
%p To validate your GitLab CI configurations, go to 'CI/CD → Pipelines' inside your project, and click on the "CI Lint" button.
|
%p.ci-linter-description To validate your GitLab CI configurations, go to 'CI/CD → Pipelines' inside your project, and click on the 'CI Lint' button.
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
%h2 Check your .gitlab-ci.yml
|
%h2 Check your .gitlab-ci.yml
|
||||||
|
|
||||||
.ci-linter
|
.project-ci-linter
|
||||||
.row
|
.row
|
||||||
= form_tag project_ci_lint_path(@project), method: :post do
|
= form_tag project_ci_lint_path(@project), method: :post do
|
||||||
.form-group
|
.form-group
|
||||||
|
@ -23,5 +23,5 @@
|
||||||
|
|
||||||
.row.prepend-top-20
|
.row.prepend-top-20
|
||||||
.col-sm-12
|
.col-sm-12
|
||||||
.results.ci-template
|
.results.project-ci-template
|
||||||
= render partial: 'create' if defined?(@status)
|
= render partial: 'create' if defined?(@status)
|
||||||
|
|
|
@ -3,10 +3,9 @@ require 'spec_helper'
|
||||||
describe 'projects/ci/lints/show' do
|
describe 'projects/ci/lints/show' do
|
||||||
include Devise::Test::ControllerHelpers
|
include Devise::Test::ControllerHelpers
|
||||||
let(:project) { create(:project, :repository) }
|
let(:project) { create(:project, :repository) }
|
||||||
|
|
||||||
describe 'XSS protection' do
|
|
||||||
let(:config_processor) { Gitlab::Ci::YamlProcessor.new(YAML.dump(content)) }
|
let(:config_processor) { Gitlab::Ci::YamlProcessor.new(YAML.dump(content)) }
|
||||||
|
|
||||||
|
describe 'XSS protection' do
|
||||||
before do
|
before do
|
||||||
assign(:project, project)
|
assign(:project, project)
|
||||||
assign(:status, true)
|
assign(:status, true)
|
||||||
|
@ -50,6 +49,7 @@ describe 'projects/ci/lints/show' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'when the content is valid' do
|
||||||
let(:content) do
|
let(:content) do
|
||||||
{
|
{
|
||||||
build_template: {
|
build_template: {
|
||||||
|
@ -62,9 +62,6 @@ describe 'projects/ci/lints/show' do
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
let(:config_processor) { Gitlab::Ci::YamlProcessor.new(YAML.dump(content)) }
|
|
||||||
|
|
||||||
context 'when the content is valid' do
|
|
||||||
before do
|
before do
|
||||||
assign(:project, project)
|
assign(:project, project)
|
||||||
assign(:status, true)
|
assign(:status, true)
|
||||||
|
|
Loading…
Reference in New Issue