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
Tatuya Kamada
gitlab-ce
Commits
37fbb15a
Commit
37fbb15a
authored
Sep 07, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactored some stuff and added new models / attributes after rebase
parent
0f15e971
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
11 deletions
+15
-11
spec/lib/gitlab/import_export/all_models.yml
spec/lib/gitlab/import_export/all_models.yml
+1
-1
spec/lib/gitlab/import_export/model_configuration_spec.rb
spec/lib/gitlab/import_export/model_configuration_spec.rb
+2
-2
spec/lib/gitlab/import_export/safe_model_attributes.yml
spec/lib/gitlab/import_export/safe_model_attributes.yml
+10
-0
spec/support/import_export/configuration_helper.rb
spec/support/import_export/configuration_helper.rb
+2
-4
spec/support/import_export/export_file_helper.rb
spec/support/import_export/export_file_helper.rb
+0
-4
No files found.
spec/lib/gitlab/import_export/all_models.yml
View file @
37fbb15a
...
@@ -11,7 +11,6 @@ issues:
...
@@ -11,7 +11,6 @@ issues:
-
labels
-
labels
-
todos
-
todos
-
user_agent_detail
-
user_agent_detail
-
project
-
moved_to
-
moved_to
-
events
-
events
events
:
events
:
...
@@ -173,3 +172,4 @@ project:
...
@@ -173,3 +172,4 @@ project:
-
triggers
-
triggers
-
environments
-
environments
-
deployments
-
deployments
-
project_feature
\ No newline at end of file
spec/lib/gitlab/import_export/model_configuration_spec.rb
View file @
37fbb15a
...
@@ -23,7 +23,7 @@ describe 'Import/Export model configuration', lib: true do
...
@@ -23,7 +23,7 @@ describe 'Import/Export model configuration', lib: true do
it
'has no new models'
do
it
'has no new models'
do
model_names
.
each
do
|
model_name
|
model_names
.
each
do
|
model_name
|
new_models
=
current_models
[
model_name
]
-
all_models
[
model_name
]
new_models
=
Array
(
current_models
[
model_name
])
-
Array
(
all_models
[
model_name
])
expect
(
new_models
).
to
be_empty
,
failure_message
(
model_name
.
classify
,
new_models
)
expect
(
new_models
).
to
be_empty
,
failure_message
(
model_name
.
classify
,
new_models
)
end
end
end
end
...
@@ -36,7 +36,7 @@ describe 'Import/Export model configuration', lib: true do
...
@@ -36,7 +36,7 @@ describe 'Import/Export model configuration', lib: true do
model_names
.
each
do
|
model_name
|
model_names
.
each
do
|
model_name
|
model_class
=
relation_class_for_name
(
model_name
)
model_class
=
relation_class_for_name
(
model_name
)
all_models_hash
[
model_name
]
=
associations_for
(
model_class
)
all_models_hash
[
model_name
]
=
associations_for
(
model_class
)
-
[
'project'
]
end
end
all_models_hash
all_models_hash
...
...
spec/lib/gitlab/import_export/safe_model_attributes.yml
View file @
37fbb15a
...
@@ -298,3 +298,13 @@ Project:
...
@@ -298,3 +298,13 @@ Project:
-
archived
-
archived
Author
:
Author
:
-
name
-
name
ProjectFeature
:
-
id
-
project_id
-
merge_requests_access_level
-
issues_access_level
-
wiki_access_level
-
snippets_access_level
-
builds_access_level
-
created_at
-
updated_at
\ No newline at end of file
spec/support/import_export/configuration_helper.rb
View file @
37fbb15a
...
@@ -23,9 +23,7 @@ module ConfigurationHelper
...
@@ -23,9 +23,7 @@ module ConfigurationHelper
attributes
attributes
end
end
def
associations_for
(
model_class
)
def
associations_for
(
safe_model
)
model_class
.
reflect_on_all_associations
.
map
do
|
association
|
safe_model
.
reflect_on_all_associations
.
map
{
|
assoc
|
assoc
.
name
.
to_s
}
association
.
name
.
to_s
end
end
end
end
end
spec/support/import_export/export_file_helper.rb
View file @
37fbb15a
...
@@ -120,10 +120,6 @@ module ExportFileHelper
...
@@ -120,10 +120,6 @@ module ExportFileHelper
false
false
end
end
def
associations_for
(
safe_model
)
safe_model
.
reflect_on_all_associations
.
map
{
|
assoc
|
assoc
.
name
.
to_s
}
end
# Compares model attributes with those those found in the hash
# Compares model attributes with those those found in the hash
# and returns true if there is a match, ignoring some excluded attributes.
# and returns true if there is a match, ignoring some excluded attributes.
def
safe_model?
(
model
,
excluded_attributes
,
parent
)
def
safe_model?
(
model
,
excluded_attributes
,
parent
)
...
...
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