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
Jérome Perrin
gitlab-ce
Commits
848a146f
Commit
848a146f
authored
Sep 29, 2016
by
James Lopez
Committed by
Douglas Barbosa Alexandre
Oct 19, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix import test
parent
0bfa39d5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
lib/gitlab/import_export/import_export.yml
lib/gitlab/import_export/import_export.yml
+3
-1
lib/gitlab/import_export/relation_factory.rb
lib/gitlab/import_export/relation_factory.rb
+3
-2
spec/features/projects/import_export/test_project_export.tar.gz
...eatures/projects/import_export/test_project_export.tar.gz
+0
-0
No files found.
lib/gitlab/import_export/import_export.yml
View file @
848a146f
...
@@ -71,7 +71,9 @@ excluded_attributes:
...
@@ -71,7 +71,9 @@ excluded_attributes:
-
:awardable_id
-
:awardable_id
methods
:
methods
:
labels
:
project_labels
:
-
:type
label
:
-
:type
-
:type
statuses
:
statuses
:
-
:type
-
:type
...
...
lib/gitlab/import_export/relation_factory.rb
View file @
848a146f
...
@@ -9,7 +9,8 @@ module Gitlab
...
@@ -9,7 +9,8 @@ module Gitlab
builds:
'Ci::Build'
,
builds:
'Ci::Build'
,
hooks:
'ProjectHook'
,
hooks:
'ProjectHook'
,
merge_access_levels:
'ProtectedBranch::MergeAccessLevel'
,
merge_access_levels:
'ProtectedBranch::MergeAccessLevel'
,
push_access_levels:
'ProtectedBranch::PushAccessLevel'
}.
freeze
push_access_levels:
'ProtectedBranch::PushAccessLevel'
,
labels: :project_labels
}.
freeze
USER_REFERENCES
=
%w[author_id assignee_id updated_by_id user_id]
.
freeze
USER_REFERENCES
=
%w[author_id assignee_id updated_by_id user_id]
.
freeze
...
@@ -19,7 +20,7 @@ module Gitlab
...
@@ -19,7 +20,7 @@ module Gitlab
IMPORTED_OBJECT_MAX_RETRIES
=
5
.
freeze
IMPORTED_OBJECT_MAX_RETRIES
=
5
.
freeze
EXISTING_OBJECT_CHECK
=
%i[milestone milestones label labels]
.
freeze
EXISTING_OBJECT_CHECK
=
%i[milestone milestones label labels
project_label project_labels
]
.
freeze
FINDER_ATTRIBUTES
=
%w[title project_id]
.
freeze
FINDER_ATTRIBUTES
=
%w[title project_id]
.
freeze
...
...
spec/features/projects/import_export/test_project_export.tar.gz
View file @
848a146f
No preview for this file type
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