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
97a82635
Commit
97a82635
authored
Dec 24, 2019
by
nmilojevic1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply suggestion from MR comments
Fix identation Fix changlog description
parent
a72ce8ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
42 deletions
+42
-42
changelogs/unreleased/39113-project-user-grafana-integrations.yml
...gs/unreleased/39113-project-user-grafana-integrations.yml
+1
-1
spec/lib/gitlab/import_export/relation_factory_spec.rb
spec/lib/gitlab/import_export/relation_factory_spec.rb
+41
-41
No files found.
changelogs/unreleased/39113-project-user-grafana-integrations.yml
View file @
97a82635
---
title
:
Preload project, user and group to reuse objects
title
:
Preload project, user and group to reuse objects
during project import
merge_request
:
21853
author
:
type
:
performance
spec/lib/gitlab/import_export/relation_factory_spec.rb
View file @
97a82635
...
...
@@ -102,19 +102,19 @@ describe Gitlab::ImportExport::RelationFactory do
let
(
:exported_member
)
do
{
"id"
=>
111
,
"access_level"
=>
30
,
"source_id"
=>
1
,
"source_type"
=>
"Project"
,
"user_id"
=>
3
,
"notification_level"
=>
3
,
"created_at"
=>
"2016-11-18T09:29:42.634Z"
,
"updated_at"
=>
"2016-11-18T09:29:42.634Z"
,
"user"
=>
{
"id"
=>
user
.
id
,
"email"
=>
user
.
email
,
"username"
=>
user
.
username
}
"id"
=>
111
,
"access_level"
=>
30
,
"source_id"
=>
1
,
"source_type"
=>
"Project"
,
"user_id"
=>
3
,
"notification_level"
=>
3
,
"created_at"
=>
"2016-11-18T09:29:42.634Z"
,
"updated_at"
=>
"2016-11-18T09:29:42.634Z"
,
"user"
=>
{
"id"
=>
user
.
id
,
"email"
=>
user
.
email
,
"username"
=>
user
.
username
}
}
end
...
...
@@ -127,24 +127,24 @@ describe Gitlab::ImportExport::RelationFactory do
let
(
:relation_hash
)
do
{
'id'
=>
27
,
'target_branch'
=>
"feature"
,
'source_branch'
=>
"feature_conflict"
,
'source_project_id'
=>
project
.
id
,
'target_project_id'
=>
project
.
id
,
'author_id'
=>
user
.
id
,
'assignee_id'
=>
user
.
id
,
'updated_by_id'
=>
user
.
id
,
'title'
=>
"MR1"
,
'created_at'
=>
"2016-06-14T15:02:36.568Z"
,
'updated_at'
=>
"2016-06-14T15:02:56.815Z"
,
'state'
=>
"opened"
,
'merge_status'
=>
"unchecked"
,
'description'
=>
"Description"
,
'position'
=>
0
,
'source_branch_sha'
=>
"ABCD"
,
'target_branch_sha'
=>
"DCBA"
,
'merge_when_pipeline_succeeds'
=>
true
'id'
=>
27
,
'target_branch'
=>
"feature"
,
'source_branch'
=>
"feature_conflict"
,
'source_project_id'
=>
project
.
id
,
'target_project_id'
=>
project
.
id
,
'author_id'
=>
user
.
id
,
'assignee_id'
=>
user
.
id
,
'updated_by_id'
=>
user
.
id
,
'title'
=>
"MR1"
,
'created_at'
=>
"2016-06-14T15:02:36.568Z"
,
'updated_at'
=>
"2016-06-14T15:02:56.815Z"
,
'state'
=>
"opened"
,
'merge_status'
=>
"unchecked"
,
'description'
=>
"Description"
,
'position'
=>
0
,
'source_branch_sha'
=>
"ABCD"
,
'target_branch_sha'
=>
"DCBA"
,
'merge_when_pipeline_succeeds'
=>
true
}
end
...
...
@@ -169,16 +169,16 @@ describe Gitlab::ImportExport::RelationFactory do
let
(
:relation_sym
)
{
:labels
}
let
(
:relation_hash
)
do
{
"id"
:
3
,
"title"
:
"test3"
,
"color"
:
"#428bca"
,
"group_id"
:
project
.
group
.
id
,
"created_at"
:
"2016-07-22T08:55:44.161Z"
,
"updated_at"
:
"2016-07-22T08:55:44.161Z"
,
"template"
:
false
,
"description"
:
""
,
"project_id"
:
project
.
id
,
"type"
:
"GroupLabel"
"id"
:
3
,
"title"
:
"test3"
,
"color"
:
"#428bca"
,
"group_id"
:
project
.
group
.
id
,
"created_at"
:
"2016-07-22T08:55:44.161Z"
,
"updated_at"
:
"2016-07-22T08:55:44.161Z"
,
"template"
:
false
,
"description"
:
""
,
"project_id"
:
project
.
id
,
"type"
:
"GroupLabel"
}
end
...
...
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