Merge branch 'dm-label-reference-period' into 'master'

Properly detect label reference if followed by period or question mark

See merge request gitlab-org/gitlab-ce!19965

app/models/label.rb

@@ -85,10 +85,15 @@ class Label < ActiveRecord::Base
       (#{Project.reference_pattern})?
       #{Regexp.escape(reference_prefix)}
       (?:
-        (?<label_id>\d+(?!\S\w)\b) | # Integer-based label ID, or
+          (?<label_id>\d+(?!\S\w)\b)
+        | # Integer-based label ID, or
           (?<label_name>
-          [A-Za-z0-9_\-\?\.&]+ | # String-based single-word label title, or
-          ".+?"                  # String-based multi-word label surrounded in quotes
+              # String-based single-word label title, or
+              [A-Za-z0-9_\-\?\.&]+
+              (?<!\.|\?)
+            |
+              # String-based multi-word label surrounded in quotes
+              ".+?"
           )
       )
     }x

changelogs/unreleased/dm-label-reference-period.yml

+---
+title: Properly detect label reference if followed by period or question mark
+merge_request:
+author:
+type: fixed

spec/lib/banzai/filter/label_reference_filter_spec.rb

@@ -148,9 +148,11 @@ describe Banzai::Filter::LabelReferenceFilter do
       expect(doc.text).to eq 'See ?g.fm&'
     end
 
-    it 'links with adjacent text' do
-      doc = reference_filter("Label (#{reference}).")
-      expect(doc.to_html).to match(%r(\(<a.+><span.+>\?g\.fm&amp;</span></a>\)\.))
+    it 'does not include trailing punctuation', :aggregate_failures do
+      ['.', ', ok?', '...', '?', '!', ': is that ok?'].each do |trailing_punctuation|
+        doc = filter("Label #{reference}#{trailing_punctuation}")
+        expect(doc.to_html).to match(%r(<a.+><span.+>\?g\.fm&amp;</span></a>#{Regexp.escape(trailing_punctuation)}))
+      end
     end
 
     it 'ignores invalid label names' do