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
6eea09fd
Commit
6eea09fd
authored
Jan 08, 2019
by
Mayra Cabrera
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes Auto DevOps Domain title on admin settings
Changes "Auto devops" to "Auto DevOps" on CI/CD admin settings
parent
1b3affaf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
2 deletions
+10
-2
app/views/admin/application_settings/_ci_cd.html.haml
app/views/admin/application_settings/_ci_cd.html.haml
+1
-1
changelogs/unreleased/fix-auto-devops-domain-title-on-admin-settings.yml
...leased/fix-auto-devops-domain-title-on-admin-settings.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/features/admin/admin_settings_spec.rb
spec/features/admin/admin_settings_spec.rb
+1
-1
No files found.
app/views/admin/application_settings/_ci_cd.html.haml
View file @
6eea09fd
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
=
s_
(
'CICD|The Auto DevOps pipeline will run if no alternative CI configuration file is found.'
)
=
s_
(
'CICD|The Auto DevOps pipeline will run if no alternative CI configuration file is found.'
)
=
link_to
_
(
'More information'
),
help_page_path
(
'topics/autodevops/index.md'
),
target:
'_blank'
=
link_to
_
(
'More information'
),
help_page_path
(
'topics/autodevops/index.md'
),
target:
'_blank'
.form-group
.form-group
=
f
.
label
:auto_devops_domain
,
class:
'label-bold'
=
f
.
label
:auto_devops_domain
,
s_
(
'AdminSettings|Auto DevOps domain'
),
class:
'label-bold'
=
f
.
text_field
:auto_devops_domain
,
class:
'form-control'
,
placeholder:
'domain.com'
=
f
.
text_field
:auto_devops_domain
,
class:
'form-control'
,
placeholder:
'domain.com'
.form-text.text-muted
.form-text.text-muted
=
s_
(
"AdminSettings|Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages."
)
=
s_
(
"AdminSettings|Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages."
)
...
...
changelogs/unreleased/fix-auto-devops-domain-title-on-admin-settings.yml
0 → 100644
View file @
6eea09fd
---
title
:
Fixes Auto DevOps title on CI/CD admin settings
merge_request
:
24249
author
:
type
:
other
locale/gitlab.pot
View file @
6eea09fd
...
@@ -450,6 +450,9 @@ msgstr ""
...
@@ -450,6 +450,9 @@ msgstr ""
msgid "AdminProjects|Delete project"
msgid "AdminProjects|Delete project"
msgstr ""
msgstr ""
msgid "AdminSettings|Auto DevOps domain"
msgstr ""
msgid "AdminSettings|Environment variables are protected by default"
msgid "AdminSettings|Environment variables are protected by default"
msgstr ""
msgstr ""
...
...
spec/features/admin/admin_settings_spec.rb
View file @
6eea09fd
...
@@ -238,7 +238,7 @@ describe 'Admin updates settings' do
...
@@ -238,7 +238,7 @@ describe 'Admin updates settings' do
page
.
within
(
'.as-ci-cd'
)
do
page
.
within
(
'.as-ci-cd'
)
do
check
'Default to Auto DevOps pipeline for all projects'
check
'Default to Auto DevOps pipeline for all projects'
fill_in
'
Auto devops
domain'
,
with:
'domain.com'
fill_in
'
application_setting_auto_devops_
domain'
,
with:
'domain.com'
click_button
'Save changes'
click_button
'Save changes'
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