Add ProjectLabel model

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/banzai/filter/label_reference_filter.rb b/lib/banzai/filter/label_reference_filter.rb
index 3a09912f1be..4c4784b0052 100644
--- a/lib/banzai/filter/label_reference_filter.rb
+++ b/lib/banzai/filter/label_reference_filter.rb
@@ -70,7 +70,7 @@ module Banzai
       end
 
       def object_link_text(object, matches)
-        if object.project.nil? || object.project == context[:project]
+        if object.is_a?(GroupLabel) || object.project == context[:project]
           LabelsHelper.render_colored_label(object)
         else
           LabelsHelper.render_colored_cross_project_label(object)
diff --git a/lib/gitlab/google_code_import/importer.rb b/lib/gitlab/google_code_import/importer.rb
index 62da327931f..ef8c3e35619 100644
--- a/lib/gitlab/google_code_import/importer.rb
+++ b/lib/gitlab/google_code_import/importer.rb
@@ -237,7 +237,7 @@ module Gitlab
 
       def create_label(name)
         color = nice_label_color(name)
-        Label.create!(project_id: project.id, name: name, color: color)
+        project.labels.create!(name: name, color: color)
       end
 
       def format_content(raw_content)