From fa639df5c74c4f41c13e1bbdb897a968b6129621 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Thu, 3 Mar 2016 10:39:18 +0100 Subject: [PATCH] Remove redundant code in cross project labels implementation --- app/models/label.rb | 7 ++++--- lib/banzai/filter/label_reference_filter.rb | 4 ---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/models/label.rb b/app/models/label.rb index f8817d9dc54..5ff644b8426 100644 --- a/app/models/label.rb +++ b/app/models/label.rb @@ -85,7 +85,8 @@ class Label < ActiveRecord::Base # Returns a String # def to_reference(from_project = nil, format: :id) - reference = label_format_reference(format) + format_reference = label_format_reference(format) + reference = "#{self.class.reference_prefix}#{format_reference}" if cross_project_reference?(from_project) project.to_reference + reference @@ -116,9 +117,9 @@ class Label < ActiveRecord::Base raise StandardError, 'Unknown format' unless [:id, :name].include?(format) if format == :name && !name.include?('"') - %(#{self.class.reference_prefix}"#{name}") + %("#{name}") else - "#{self.class.reference_prefix}#{id}" + id end end end diff --git a/lib/banzai/filter/label_reference_filter.rb b/lib/banzai/filter/label_reference_filter.rb index 85fec970ebd..8147e5ed3c7 100644 --- a/lib/banzai/filter/label_reference_filter.rb +++ b/lib/banzai/filter/label_reference_filter.rb @@ -16,10 +16,6 @@ module Banzai end end - def self.referenced_by(node) - { label: LazyReference.new(Label, node.attr("data-label")) } - end - def references_in(text, pattern = Label.reference_pattern) text.gsub(pattern) do |match| project = project_from_ref($~[:project])