From eaa0303b3d2f1480222c94a85d356b055f7100b3 Mon Sep 17 00:00:00 2001
From: Ahmad Sherif <me@ahmadsherif.com>
Date: Wed, 2 Nov 2016 22:37:56 +0200
Subject: [PATCH] Cache imported GH labels no matter what
---
lib/gitlab/github_import/importer.rb | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index bdabc71194d..90cf38a8513 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -52,15 +52,14 @@ module Gitlab
fetch_resources(:labels, repo, per_page: 100) do |labels|
labels.each do |raw|
begin
- label = LabelFormatter.new(project, raw).create!
- @labels[label.title] = label.id
+ LabelFormatter.new(project, raw).create!
rescue => e
errors << { type: :label, url: Gitlab::UrlSanitizer.sanitize(raw.url), errors: e.message }
end
end
end
- ensure_labels_are_cached
+ cache_labels!
end
def import_milestones
@@ -236,9 +235,7 @@ module Gitlab
end
end
- def ensure_labels_are_cached
- return unless @labels.empty?
-
+ def cache_labels!
project.labels.select(:id, :title).find_each do |label|
@labels[label.title] = label.id
end
--
GitLab