Commit 97a82635 authored by nmilojevic1's avatar nmilojevic1

Apply suggestion from MR comments

Fix identation
Fix changlog description
parent a72ce8ca
--- ---
title: Preload project, user and group to reuse objects title: Preload project, user and group to reuse objects during project import
merge_request: 21853 merge_request: 21853
author: author:
type: performance type: performance
...@@ -102,19 +102,19 @@ describe Gitlab::ImportExport::RelationFactory do ...@@ -102,19 +102,19 @@ describe Gitlab::ImportExport::RelationFactory do
let(:exported_member) do let(:exported_member) do
{ {
"id" => 111, "id" => 111,
"access_level" => 30, "access_level" => 30,
"source_id" => 1, "source_id" => 1,
"source_type" => "Project", "source_type" => "Project",
"user_id" => 3, "user_id" => 3,
"notification_level" => 3, "notification_level" => 3,
"created_at" => "2016-11-18T09:29:42.634Z", "created_at" => "2016-11-18T09:29:42.634Z",
"updated_at" => "2016-11-18T09:29:42.634Z", "updated_at" => "2016-11-18T09:29:42.634Z",
"user" => { "user" => {
"id" => user.id, "id" => user.id,
"email" => user.email, "email" => user.email,
"username" => user.username "username" => user.username
} }
} }
end end
...@@ -127,24 +127,24 @@ describe Gitlab::ImportExport::RelationFactory do ...@@ -127,24 +127,24 @@ describe Gitlab::ImportExport::RelationFactory do
let(:relation_hash) do let(:relation_hash) do
{ {
'id' => 27, 'id' => 27,
'target_branch' => "feature", 'target_branch' => "feature",
'source_branch' => "feature_conflict", 'source_branch' => "feature_conflict",
'source_project_id' => project.id, 'source_project_id' => project.id,
'target_project_id' => project.id, 'target_project_id' => project.id,
'author_id' => user.id, 'author_id' => user.id,
'assignee_id' => user.id, 'assignee_id' => user.id,
'updated_by_id' => user.id, 'updated_by_id' => user.id,
'title' => "MR1", 'title' => "MR1",
'created_at' => "2016-06-14T15:02:36.568Z", 'created_at' => "2016-06-14T15:02:36.568Z",
'updated_at' => "2016-06-14T15:02:56.815Z", 'updated_at' => "2016-06-14T15:02:56.815Z",
'state' => "opened", 'state' => "opened",
'merge_status' => "unchecked", 'merge_status' => "unchecked",
'description' => "Description", 'description' => "Description",
'position' => 0, 'position' => 0,
'source_branch_sha' => "ABCD", 'source_branch_sha' => "ABCD",
'target_branch_sha' => "DCBA", 'target_branch_sha' => "DCBA",
'merge_when_pipeline_succeeds' => true 'merge_when_pipeline_succeeds' => true
} }
end end
...@@ -169,16 +169,16 @@ describe Gitlab::ImportExport::RelationFactory do ...@@ -169,16 +169,16 @@ describe Gitlab::ImportExport::RelationFactory do
let(:relation_sym) { :labels } let(:relation_sym) { :labels }
let(:relation_hash) do let(:relation_hash) do
{ {
"id": 3, "id": 3,
"title": "test3", "title": "test3",
"color": "#428bca", "color": "#428bca",
"group_id": project.group.id, "group_id": project.group.id,
"created_at": "2016-07-22T08:55:44.161Z", "created_at": "2016-07-22T08:55:44.161Z",
"updated_at": "2016-07-22T08:55:44.161Z", "updated_at": "2016-07-22T08:55:44.161Z",
"template": false, "template": false,
"description": "", "description": "",
"project_id": project.id, "project_id": project.id,
"type": "GroupLabel" "type": "GroupLabel"
} }
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment