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
57060295
Commit
57060295
authored
Jan 22, 2018
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expose auto_devops_domain in admin settings view
parent
147f0428
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletion
+17
-1
app/helpers/application_settings_helper.rb
app/helpers/application_settings_helper.rb
+1
-0
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+6
-1
spec/features/admin/admin_settings_spec.rb
spec/features/admin/admin_settings_spec.rb
+10
-0
No files found.
app/helpers/application_settings_helper.rb
View file @
57060295
...
...
@@ -148,6 +148,7 @@ module ApplicationSettingsHelper
:akismet_enabled
,
:authorized_keys_enabled
,
:auto_devops_enabled
,
:auto_devops_domain
,
:circuitbreaker_access_retries
,
:circuitbreaker_check_interval
,
:circuitbreaker_failure_count_threshold
,
...
...
app/views/admin/application_settings/_form.html.haml
View file @
57060295
...
...
@@ -249,7 +249,12 @@
.help-block
It will automatically build, test, and deploy applications based on a predefined CI/CD configuration
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'topics/autodevops/index.md'
)
.form-group
=
f
.
label
:auto_devops_domain
,
class:
'control-label col-sm-2'
.col-sm-10
=
f
.
text_field
:auto_devops_domain
,
class:
'form-control'
,
placeholder:
'domain.com'
.help-block
=
s_
(
"Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages."
)
.form-group
.col-sm-offset-2.col-sm-10
.checkbox
...
...
spec/features/admin/admin_settings_spec.rb
View file @
57060295
...
...
@@ -47,6 +47,16 @@ feature 'Admin updates settings' do
expect
(
page
).
to
have_content
"Application settings saved successfully"
end
scenario
'Change AutoDevOps settings'
do
check
'Enabled Auto DevOps (Beta) for projects by default'
fill_in
'Auto devops domain'
,
with:
'domain.com'
click_button
'Save'
expect
(
current_application_settings
.
auto_devops_enabled?
).
to
be
true
expect
(
current_application_settings
.
auto_devops_domain
).
to
eq
(
'domain.com'
)
expect
(
page
).
to
have_content
"Application settings saved successfully"
end
scenario
'Change Slack Notifications Service template settings'
do
first
(
:link
,
'Service Templates'
).
click
click_link
'Slack notifications'
...
...
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