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
Boxiang Sun
gitlab-ce
Commits
cbd173a8
Commit
cbd173a8
authored
7 years ago
by
Kamil Trzciński
Committed by
Phil Hughes
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add collapsable sections for Pipeline Settings
parent
58e367fd
No related merge requests found
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
94 additions
and
63 deletions
+94
-63
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+2
-0
app/views/ci/variables/_content.html.haml
app/views/ci/variables/_content.html.haml
+3
-9
app/views/ci/variables/_index.html.haml
app/views/ci/variables/_index.html.haml
+1
-3
app/views/ci/variables/_show.html.haml
app/views/ci/variables/_show.html.haml
+1
-1
app/views/projects/pipelines_settings/_badge.html.haml
app/views/projects/pipelines_settings/_badge.html.haml
+30
-32
app/views/projects/pipelines_settings/_show.html.haml
app/views/projects/pipelines_settings/_show.html.haml
+1
-4
app/views/projects/settings/ci_cd/show.html.haml
app/views/projects/settings/ci_cd/show.html.haml
+48
-4
app/views/projects/triggers/_content.html.haml
app/views/projects/triggers/_content.html.haml
+2
-8
app/views/projects/triggers/_index.html.haml
app/views/projects/triggers/_index.html.haml
+1
-2
changelogs/unreleased/collapsable-pipeline-settings.yml
changelogs/unreleased/collapsable-pipeline-settings.yml
+5
-0
No files found.
app/assets/javascripts/dispatcher.js
View file @
cbd173a8
...
...
@@ -488,6 +488,8 @@ import initChangesDropdown from './init_changes_dropdown';
initSettingsPanels
();
break
;
case
'
projects:settings:ci_cd:show
'
:
// Initialize expandable settings panels
initSettingsPanels
();
case
'
groups:settings:ci_cd:show
'
:
new
gl
.
ProjectVariables
();
break
;
...
...
This diff is collapsed.
Click to expand it.
app/views/ci/variables/_content.html.haml
View file @
cbd173a8
%h4
.prepend-top-0
Secret variables
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'ci/variables/README'
,
anchor:
'secret-variables'
),
target:
'_blank'
%p
These variables will be set to environment by the runner, and could be protected by exposing only to protected branches or tags.
%p
So you can use them for passwords, secret keys or whatever you want.
%p
The value of the variable can be visible in job log if explicitly asked to do so.
%p
.append-bottom-default
Variables are applied to environments via the runner. They can be protected by only exposing them to protected branches or tags.
You can use variables for passwords, secret keys, or whatever you want.
This diff is collapsed.
Click to expand it.
app/views/ci/variables/_index.html.haml
View file @
cbd173a8
.row.prepend-top-default.append-bottom-default
.col-lg-4
=
render
"ci/variables/content"
.col-lg-8
.col-lg-12
%h5
.prepend-top-0
Add a variable
=
render
"ci/variables/form"
,
btn_text:
"Add new variable"
...
...
This diff is collapsed.
Click to expand it.
app/views/ci/variables/_show.html.haml
View file @
cbd173a8
...
...
@@ -4,6 +4,6 @@
.col-lg-3
=
render
"ci/variables/content"
.col-lg-9
%h
5
.prepend-top-0
%h
4
.prepend-top-0
Update variable
=
render
"ci/variables/form"
,
btn_text:
"Save variable"
This diff is collapsed.
Click to expand it.
app/views/projects/pipelines_settings/_badge.html.haml
View file @
cbd173a8
%div
{
class:
badge
.
title
.
gsub
(
' '
,
'-'
)
}
.col-lg-
4.profile-settings-sidebar
%h4
.prepend-top-0
.col-lg-
12
%h4
=
badge
.
title
.
capitalize
.col-lg-8
.prepend-top-10
.panel.panel-default
.panel-heading
%b
=
badge
.
title
.
capitalize
·
=
badge
.
to_html
.pull-right
=
render
'shared/ref_switcher'
,
destination:
'badges'
,
align_right:
true
.panel-body
.row
.col-md-2.text-center
Markdown
.col-md-10.code.js-syntax-highlight
=
highlight
(
'.md'
,
badge
.
to_markdown
)
.row
%hr
.row
.col-md-2.text-center
HTML
.col-md-10.code.js-syntax-highlight
=
highlight
(
'.html'
,
badge
.
to_html
)
.row
%hr
.row
.col-md-2.text-center
AsciiDoc
.col-md-10.code.js-syntax-highlight
=
highlight
(
'.adoc'
,
badge
.
to_asciidoc
)
.panel.panel-default
.panel-heading
%b
=
badge
.
title
.
capitalize
·
=
badge
.
to_html
.pull-right
=
render
'shared/ref_switcher'
,
destination:
'badges'
,
align_right:
true
.panel-body
.row
.col-md-2.text-center
Markdown
.col-md-10.code.js-syntax-highlight
=
highlight
(
'.md'
,
badge
.
to_markdown
)
.row
%hr
.row
.col-md-2.text-center
HTML
.col-md-10.code.js-syntax-highlight
=
highlight
(
'.html'
,
badge
.
to_html
)
.row
%hr
.row
.col-md-2.text-center
AsciiDoc
.col-md-10.code.js-syntax-highlight
=
highlight
(
'.adoc'
,
badge
.
to_asciidoc
)
This diff is collapsed.
Click to expand it.
app/views/projects/pipelines_settings/_show.html.haml
View file @
cbd173a8
.row.prepend-top-default
.col-lg-4.profile-settings-sidebar
%h4
.prepend-top-0
Pipelines
.col-lg-8
.col-lg-12
=
form_for
@project
,
url:
project_pipelines_settings_path
(
@project
)
do
|
f
|
%fieldset
.builds-feature
-
unless
@repository
.
gitlab_ci_yml
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/settings/ci_cd/show.html.haml
View file @
cbd173a8
...
...
@@ -4,7 +4,51 @@
=
render
"projects/settings/head"
=
render
'projects/runners/index'
=
render
'ci/variables/index'
=
render
'projects/triggers/index'
=
render
'projects/pipelines_settings/show'
-
expanded
=
Rails
.
env
.
test?
%section
.settings
.settings-header
%h4
General pipelines settings
%button
.btn.js-settings-toggle
=
expanded
?
'Collapse'
:
'Expand'
%p
Update your CI/CD configuration, like job timeout.
.settings-content.no-animate
{
class:
(
'expanded'
if
expanded
)
}
=
render
'projects/pipelines_settings/show'
%section
.settings
.settings-header
%h4
Runners settings
%button
.btn.js-settings-toggle
=
expanded
?
'Collapse'
:
'Expand'
%p
Register and see your runners for this project.
.settings-content.no-animate
{
class:
(
'expanded'
if
expanded
)
}
=
render
'projects/runners/index'
%section
.settings
.settings-header
%h4
Secret variables
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'ci/variables/README'
,
anchor:
'secret-variables'
),
target:
'_blank'
%button
.btn.js-settings-toggle
=
expanded
?
'Collapse'
:
'Expand'
%p
=
render
"ci/variables/content"
.settings-content.no-animate
{
class:
(
'expanded'
if
expanded
)
}
=
render
'ci/variables/index'
%section
.settings
.settings-header
%h4
Pipeline triggers
%button
.btn.js-settings-toggle
=
expanded
?
'Collapse'
:
'Expand'
%p
Triggers can force a specific branch or tag to get rebuilt with an API call. These tokens will
impersonate their associated user including their access to projects and their project
permissions.
.settings-content.no-animate
{
class:
(
'expanded'
if
expanded
)
}
=
render
'projects/triggers/index'
This diff is collapsed.
Click to expand it.
app/views/projects/triggers/_content.html.haml
View file @
cbd173a8
%h4
.prepend-top-0
Triggers
%p
.prepend-top-20
Triggers can force a specific branch or tag to get rebuilt with an API call. These tokens will
impersonate their associated user including their access to projects and their project
permissions.
%p
.prepend-top-20
%p
.append-bottom-default
Triggers with the
%span
.label.label-primary
legacy
label do not have an associated user and only have access to the current project.
%p
.append-bottom-0
%br
=
succeed
'.'
do
Learn more in the
=
link_to
'triggers documentation'
,
help_page_path
(
'ci/triggers/README'
),
target:
'_blank'
This diff is collapsed.
Click to expand it.
app/views/projects/triggers/_index.html.haml
View file @
cbd173a8
.row.prepend-top-default.append-bottom-default.triggers-container
.col-lg-
4
.col-lg-
12
=
render
"projects/triggers/content"
.col-lg-8
.panel.panel-default
.panel-heading
%h4
.panel-title
...
...
This diff is collapsed.
Click to expand it.
changelogs/unreleased/collapsable-pipeline-settings.yml
0 → 100644
View file @
cbd173a8
---
title
:
Add collapsable sections for Pipeline Settings
merge_request
:
author
:
type
:
added
This diff is collapsed.
Click to expand it.
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