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
2c11cab3
Commit
2c11cab3
authored
Jun 06, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update wording of domain input subtext
parent
c346e647
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/views/projects/settings/ci_cd/_autodevops_form.html.haml
app/views/projects/settings/ci_cd/_autodevops_form.html.haml
+2
-2
No files found.
app/views/projects/settings/ci_cd/_autodevops_form.html.haml
View file @
2c11cab3
.row
.prepend-top-default
.row
.col-lg-12
.col-lg-12
=
form_for
@project
,
url:
project_settings_ci_cd_path
(
@project
)
do
|
f
|
=
form_for
@project
,
url:
project_settings_ci_cd_path
(
@project
)
do
|
f
|
=
form_errors
(
@project
)
=
form_errors
(
@project
)
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
%strong
=
_
(
'Domain'
)
%strong
=
_
(
'Domain'
)
=
form
.
text_field
:domain
,
class:
'form-control'
,
placeholder:
'domain.com'
=
form
.
text_field
:domain
,
class:
'form-control'
,
placeholder:
'domain.com'
.form-text.text-muted
.form-text.text-muted
=
s_
(
'CICD|
A domain is required to use Auto Review Apps and Auto Deploy S
tages.'
)
=
s_
(
'CICD|
You need to specify a domain if you want to use Auto Review Apps and Auto Deploy s
tages.'
)
-
if
cluster_ingress_ip
=
cluster_ingress_ip
(
@project
)
-
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
}
=
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'
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'topics/autodevops/index.md'
,
anchor:
'auto-devops-base-domain'
),
target:
'_blank'
...
...
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