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
e2ff570f
Commit
e2ff570f
authored
Jun 06, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add help links to the deployment strategy options
parent
7830d406
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
app/views/projects/settings/ci_cd/_autodevops_form.html.haml
app/views/projects/settings/ci_cd/_autodevops_form.html.haml
+2
-0
app/views/projects/settings/ci_cd/show.html.haml
app/views/projects/settings/ci_cd/show.html.haml
+2
-2
No files found.
app/views/projects/settings/ci_cd/_autodevops_form.html.haml
View file @
e2ff570f
...
...
@@ -47,10 +47,12 @@
=
form
.
radio_button
:deploy_strategy
,
'continuous'
,
class:
'form-check-input'
=
form
.
label
:deploy_strategy_continuous
,
class:
'form-check-label'
do
%strong
=
s_
(
'CICD|Continuous deployment to production'
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'topics/autodevops/index.md'
,
anchor:
'auto-deploy'
),
target:
'_blank'
.form-check
=
form
.
radio_button
:deploy_strategy
,
'manual'
,
class:
'form-check-input'
=
form
.
label
:deploy_strategy_manual
,
class:
'form-check-label'
do
%strong
=
s_
(
'CICD|Automatic deployment to staging, manual deployment to production'
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'ci/environments.md'
,
anchor:
'manually-deploying-to-environments'
),
target:
'_blank'
.card
.card-body
...
...
app/views/projects/settings/ci_cd/show.html.haml
View file @
e2ff570f
...
...
@@ -16,12 +16,12 @@
.settings-content
=
render
'form'
%section
.settings
#autodevops-settings
.no-animate
{
class:
(
'expanded'
if
expanded
)
}
%section
.settings
#autodevops-settings
.no-animate
{
class:
(
'expanded'
if
true
)
}
.settings-header
%h4
=
s_
(
'CICD|Auto DevOps'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
true
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
=
s_
(
'CICD|Auto DevOps will automatically build, test, and deploy your application based on a predefined Continuous Integration and Delivery configuration.'
)
=
link_to
s_
(
'CICD|Learn more about Auto DevOps'
),
help_page_path
(
'topics/autodevops/index.md'
)
...
...
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