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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
1bf79069
Commit
1bf79069
authored
May 04, 2018
by
Mayra Cabrera
Committed by
Douwe Maan
May 04, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EE Port for: "Resolve "Import/Export (import) is broken due to the addition of a CI table""
parent
ec551e5b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
app/models/project.rb
app/models/project.rb
+1
-1
changelogs/unreleased/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
spec/models/project_spec.rb
spec/models/project_spec.rb
+8
-0
No files found.
app/models/project.rb
View file @
1bf79069
...
...
@@ -241,7 +241,7 @@ class Project < ActiveRecord::Base
has_many
:custom_attributes
,
class_name:
'ProjectCustomAttribute'
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
: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 @
1bf79069
---
title
:
Resolve Import/Export ci_cd_settings error updating the project
merge_request
:
46049
author
:
type
:
fixed
spec/models/project_spec.rb
View file @
1bf79069
...
...
@@ -103,6 +103,14 @@ describe Project do
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
let
(
:project
)
{
create
(
:project
,
:public
,
:access_requestable
)
}
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