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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
f4772b37
Commit
f4772b37
authored
Jan 04, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change CI template linter textarea with Ace Editor
parent
7c2a4699
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
61 additions
and
15 deletions
+61
-15
app/assets/javascripts/ci_lint_editor.js.es6
app/assets/javascripts/ci_lint_editor.js.es6
+18
-0
app/assets/javascripts/dispatcher.js.es6
app/assets/javascripts/dispatcher.js.es6
+4
-0
app/assets/stylesheets/pages/lint.scss
app/assets/stylesheets/pages/lint.scss
+10
-0
app/views/ci/lints/show.html.haml
app/views/ci/lints/show.html.haml
+19
-12
changelogs/unreleased/didemacet-ci-lint-page.yml
changelogs/unreleased/didemacet-ci-lint-page.yml
+4
-0
spec/features/ci_lint_spec.rb
spec/features/ci_lint_spec.rb
+6
-3
No files found.
app/assets/javascripts/ci_lint_editor.js.es6
0 → 100644
View file @
f4772b37
(() => {
window.gl = window.gl || {};
class CILintEditor {
constructor() {
this.editor = window.ace.edit('ci-editor');
this.textarea = document.querySelector('#content');
this.editor.getSession().setMode('ace/mode/yaml');
this.editor.on('input', () => {
const content = this.editor.getSession().getValue();
this.textarea.value = content;
});
}
}
gl.CILintEditor = CILintEditor;
})();
app/assets/javascripts/dispatcher.js.es6
View file @
f4772b37
...
@@ -275,6 +275,10 @@
...
@@ -275,6 +275,10 @@
case 'projects:variables:index':
case 'projects:variables:index':
new gl.ProjectVariables();
new gl.ProjectVariables();
break;
break;
case 'ci:lints:create':
case 'ci:lints:show':
new gl.CILintEditor();
break;
}
}
switch (path.first()) {
switch (path.first()) {
case 'admin':
case 'admin':
...
...
app/assets/stylesheets/pages/lint.scss
View file @
f4772b37
...
@@ -9,3 +9,13 @@
...
@@ -9,3 +9,13 @@
color
:
$lint-correct-color
;
color
:
$lint-correct-color
;
}
}
}
}
.ci-linter
{
.ci-editor
{
height
:
400px
;
}
.ci-template
pre
{
white-space
:
pre-wrap
;
}
}
app/views/ci/lints/show.html.haml
View file @
f4772b37
...
@@ -2,19 +2,26 @@
...
@@ -2,19 +2,26 @@
-
page_description
"Validate your GitLab CI configuration file"
-
page_description
"Validate your GitLab CI configuration file"
%h2
Check your .gitlab-ci.yml
%h2
Check your .gitlab-ci.yml
%hr
.row
.ci-linter
.row
=
form_tag
ci_lint_path
,
method: :post
do
=
form_tag
ci_lint_path
,
method: :post
do
.form-group
.form-group
=
label_tag
(
:content
,
'Content of .gitlab-ci.yml'
,
class:
'control-label text-nowrap'
)
.col-sm-12
.col-sm-12
=
text_area_tag
(
:content
,
@content
,
class:
'form-control span1'
,
rows:
7
,
require:
true
)
.file-holder
.file-title.clearfix
Content of .gitlab-ci.yml
#ci-editor
.ci-editor
#{
@content
}
=
text_area_tag
(
:content
,
@content
,
class:
'hidden form-control span1'
,
rows:
7
,
require:
true
)
.col-sm-12
.col-sm-12
.pull-left.prepend-top-10
.pull-left.prepend-top-10
=
submit_tag
(
'Validate'
,
class:
'btn btn-success submit-yml'
)
=
submit_tag
(
'Validate'
,
class:
'btn btn-success submit-yml'
)
.row.prepend-top-20
.row.prepend-top-20
.col-sm-12
.col-sm-12
.results
.results.ci-template
=
render
partial:
'create'
if
defined?
(
@status
)
=
render
partial:
'create'
if
defined?
(
@status
)
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_tag
(
'lib/ace.js'
)
changelogs/unreleased/didemacet-ci-lint-page.yml
0 → 100644
View file @
f4772b37
---
title
:
Change CI template linter textarea with Ace Editor
merge_request
:
8452
author
:
Didem Acet
spec/features/ci_lint_spec.rb
View file @
f4772b37
require
'spec_helper'
require
'spec_helper'
describe
'CI Lint'
do
describe
'CI Lint'
,
js:
true
do
before
do
before
do
login_as
:user
login_as
:user
end
end
...
@@ -8,7 +8,10 @@ describe 'CI Lint' do
...
@@ -8,7 +8,10 @@ describe 'CI Lint' do
describe
'YAML parsing'
do
describe
'YAML parsing'
do
before
do
before
do
visit
ci_lint_path
visit
ci_lint_path
fill_in
'content'
,
with:
yaml_content
# Ace editor updates a hidden textarea and it happens asynchronously
# `sleep 0.1` is actually needed here because of this
execute_script
(
"ace.edit('ci-editor').setValue("
+
yaml_content
.
to_json
+
");"
)
sleep
0.1
click_on
'Validate'
click_on
'Validate'
end
end
...
@@ -40,7 +43,7 @@ describe 'CI Lint' do
...
@@ -40,7 +43,7 @@ describe 'CI Lint' do
let
(
:yaml_content
)
{
'my yaml content'
}
let
(
:yaml_content
)
{
'my yaml content'
}
it
'loads previous YAML content after validation'
do
it
'loads previous YAML content after validation'
do
expect
(
page
).
to
have_field
(
'content'
,
with:
'my yaml content'
,
type:
'textarea'
)
expect
(
page
).
to
have_field
(
'content'
,
with:
'my yaml content'
,
visible:
false
,
type:
'textarea'
)
end
end
end
end
end
end
...
...
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