Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
02fc70a899de
Commit
02fc70a8
authored
Sep 04, 2017
by
Zeger-Jan van de Weg
Browse files
Fix tests
parent
565baf5aa6bb
Changes
7
Hide whitespace changes
Inline
Side-by-side
app/models/project.rb
View file @
02fc70a8
...
...
@@ -468,7 +468,11 @@
end
def
auto_devops_enabled?
auto_devops
&
.
enabled?
||
current_application_settings
.
auto_devops_enabled?
if
auto_devops
auto_devops
.
enabled?
else
current_application_settings
.
auto_devops_enabled?
end
end
def
repository_storage_path
...
...
app/views/admin/application_settings/_form.html.haml
View file @
02fc70a8
...
...
@@ -226,8 +226,8 @@
Enabled Auto DevOps (Beta) for projects by default
.help-block
It will automatically build, test, and deploy applications based on a predefined CI/CD configuration
-
# Fix this link
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'user/admin_area/settings/continuous_integration'
,
anchor:
'maximum-artifacts-size'
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'topics/autodevops/index.md'
)
.form-group
.col-sm-offset-2.col-sm-10
.checkbox
...
...
config/initializers/0_inflections.rb
View file @
02fc70a8
...
...
@@ -14,6 +14,6 @@
award_emoji
project_statistics
system_note_metadata
project_
auto_devops
auto_devops
)
end
lib/gitlab/import_export/import_export.yml
View file @
02fc70a8
...
...
@@ -50,7 +50,7 @@
-
:push_event_payload
-
:stages
-
:statuses
-
:
project_
auto_devops
-
:auto_devops
-
:triggers
-
:pipeline_schedules
-
:services
...
...
lib/gitlab/import_export/relation_factory.rb
View file @
02fc70a8
...
...
@@ -14,6 +14,7 @@
create_access_levels:
'ProtectedTag::CreateAccessLevel'
,
labels: :project_labels
,
priorities: :label_priorities
,
auto_devops:
'ProjectAutoDevops'
,
label: :project_label
}.
freeze
USER_REFERENCES
=
%w[author_id assignee_id updated_by_id user_id created_by_id last_edited_by_id merge_user_id resolved_by_id]
.
freeze
...
...
spec/features/projects/settings/pipelines_settings_spec.rb
View file @
02fc70a8
...
...
@@ -41,5 +41,15 @@
checkbox
=
find_field
(
'project_auto_cancel_pending_pipelines'
)
expect
(
checkbox
).
to
be_checked
end
scenario
'update auto devops settings'
do
fill_in
(
'project_auto_devops_attributes_domain'
,
with:
'test.com'
)
page
.
choose
(
'project_auto_devops_attributes_enabled_false'
)
click_on
'Save changes'
expect
(
page
.
status_code
).
to
eq
(
200
)
expect
(
project
.
auto_devops
).
to
be_present
expect
(
project
.
auto_devops
).
not_to
be_enabled
end
end
end
spec/lib/gitlab/import_export/safe_model_attributes.yml
View file @
02fc70a8
...
...
@@ -224,6 +224,7 @@
-
lock_version
-
auto_canceled_by_id
-
pipeline_schedule_id
-
config_source
Ci::Stage:
-
id
-
name
...
...
@@ -462,3 +463,7 @@
-
user_id
-
created_at
-
updated_at
ProjectAutoDevops
:
-
id
-
enabled
-
domain
Write
Preview
Supports
Markdown
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