BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
bc7ea2d4
Unverified
Commit
bc7ea2d4
authored
May 04, 2018
by
James Lopez
Committed by
James Lopez
May 04, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add ci_cd_settings delete_all dependency on project
parent
2d23cb1b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
project.rb
app/models/project.rb
+1
-1
46049-import-export-import-is-broken-due-to-the-addition-of-a-ci-table.yml
...rt-import-is-broken-due-to-the-addition-of-a-ci-table.yml
+5
-0
project_spec.rb
spec/models/project_spec.rb
+8
-0
No files found.
app/models/project.rb
View file @
bc7ea2d4
...
@@ -234,7 +234,7 @@ class Project < ActiveRecord::Base
...
@@ -234,7 +234,7 @@ class Project < ActiveRecord::Base
has_many
:custom_attributes
,
class_name:
'ProjectCustomAttribute'
has_many
:custom_attributes
,
class_name:
'ProjectCustomAttribute'
has_many
:project_badges
,
class_name:
'ProjectBadge'
has_many
:project_badges
,
class_name:
'ProjectBadge'
has_one
:ci_cd_settings
,
class_name:
'ProjectCiCdSetting'
,
inverse_of: :project
,
autosave:
true
has_one
:ci_cd_settings
,
class_name:
'ProjectCiCdSetting'
,
inverse_of: :project
,
autosave:
true
,
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
accepts_nested_attributes_for
:variables
,
allow_destroy:
true
accepts_nested_attributes_for
:variables
,
allow_destroy:
true
accepts_nested_attributes_for
:project_feature
,
update_only:
true
accepts_nested_attributes_for
:project_feature
,
update_only:
true
...
...
changelogs/unreleased/46049-import-export-import-is-broken-due-to-the-addition-of-a-ci-table.yml
0 → 100644
View file @
bc7ea2d4
---
title
:
Resolve Import/Export ci_cd_settings error updating the project
merge_request
:
46049
author
:
type
:
fixed
spec/models/project_spec.rb
View file @
bc7ea2d4
...
@@ -101,6 +101,14 @@ describe Project do
...
@@ -101,6 +101,14 @@ describe Project do
end
end
end
end
context
'updating cd_cd_settings'
do
it
'does not raise an error'
do
project
=
create
(
:project
)
expect
{
project
.
update
(
ci_cd_settings:
nil
)
}.
not_to
raise_exception
end
end
describe
'#members & #requesters'
do
describe
'#members & #requesters'
do
let
(
:project
)
{
create
(
:project
,
:public
,
:access_requestable
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
:access_requestable
)
}
let
(
:requester
)
{
create
(
:user
)
}
let
(
:requester
)
{
create
(
:user
)
}
...
...
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