From 276b3a7bc202bd9b51c8f5401f4c525227f3a4d8 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 14 Oct 2015 09:27:30 +0200
Subject: [PATCH] Make Mentionable#cross_reference_exists? private.
---
app/models/concerns/mentionable.rb | 12 ++++++------
spec/support/mentionable_shared_examples.rb | 7 -------
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb
index 5f53ea25630..b34def66d2e 100644
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
@@ -41,12 +41,6 @@ module Mentionable
self
end
- # Determine whether or not a cross-reference Note has already been created between this Mentionable and
- # the specified target.
- def cross_reference_exists?(target)
- SystemNoteService.cross_reference_exists?(target, local_reference)
- end
-
def all_references(current_user = self.author, text = self.mentionable_text)
ext = Gitlab::ReferenceExtractor.new(self.project, current_user)
ext.analyze(text)
@@ -111,4 +105,10 @@ module Mentionable
# Only include changed fields that are mentionable
source.select { |key, val| mentionable.include?(key) }
end
+
+ # Determine whether or not a cross-reference Note has already been created between this Mentionable and
+ # the specified target.
+ def cross_reference_exists?(target)
+ SystemNoteService.cross_reference_exists?(target, local_reference)
+ end
end
diff --git a/spec/support/mentionable_shared_examples.rb b/spec/support/mentionable_shared_examples.rb
index 412c6f4ead8..f584904845e 100644
--- a/spec/support/mentionable_shared_examples.rb
+++ b/spec/support/mentionable_shared_examples.rb
@@ -86,13 +86,6 @@ shared_examples 'a mentionable' do
subject.create_cross_references!
end
-
- it 'detects existing cross-references' do
- SystemNoteService.cross_reference(mentioned_issue, subject.local_reference, author)
-
- expect(subject.cross_reference_exists?(mentioned_issue)).to be_truthy
- expect(subject.cross_reference_exists?(mentioned_mr)).to be_falsey
- end
end
shared_examples 'an editable mentionable' do
--
GitLab