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
7830d406
Commit
7830d406
authored
Jun 06, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add deploy strategy radio buttons
parent
d9c67a70
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
2 deletions
+15
-2
app/controllers/projects/settings/ci_cd_controller.rb
app/controllers/projects/settings/ci_cd_controller.rb
+1
-1
app/views/projects/settings/ci_cd/_autodevops_form.html.haml
app/views/projects/settings/ci_cd/_autodevops_form.html.haml
+14
-1
No files found.
app/controllers/projects/settings/ci_cd_controller.rb
View file @
7830d406
...
...
@@ -41,7 +41,7 @@ module Projects
:runners_token
,
:builds_enabled
,
:build_allow_git_fetch
,
:build_timeout_human_readable
,
:build_coverage_regex
,
:public_builds
,
:auto_cancel_pending_pipelines
,
:ci_config_path
,
auto_devops_attributes:
[
:id
,
:domain
,
:enabled
]
auto_devops_attributes:
[
:id
,
:domain
,
:enabled
,
:deploy_strategy
]
)
end
...
...
app/views/projects/settings/ci_cd/_autodevops_form.html.haml
View file @
7830d406
...
...
@@ -38,7 +38,20 @@
-
if
cluster_ingress_ip
=
cluster_ingress_ip
(
@project
)
=
s_
(
'%{nip_domain} can be used as an alternative to a custom domain.'
).
html_safe
%
{
nip_domain:
"<code>
#{
cluster_ingress_ip
}
.nip.io</code>"
.
html_safe
}
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'topics/autodevops/index.md'
,
anchor:
'auto-devops-base-domain'
),
target:
'_blank'
%label
.prepend-top-10
%strong
=
s_
(
'CICD|Deployment strategy'
)
%p
.settings-message.text-center
=
s_
(
'CICD|Deployment strategy needs a domain name to work correctly.'
)
.form-check
=
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'
)
.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'
)
.card
.card-body
.form-check
...
...
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