Merge branch 'stable_ce_into_ee' into '7-11-stable-ee'

Stable 7-11 ce into ee

See merge request !407

VERSION

-7.11.2-ee
\ No newline at end of file
+7.11.2-ee

lib/gitlab/markdown/label_reference_filter.rb

@@ -84,11 +84,11 @@ def render_colored_label(label)
       #
       # Returns a Hash.
       def label_params(id, name)
-        if id > 0
-          { id: id }
-        else
+        if name
           # TODO (rspeicher): Don't strip single quotes if we decide to only use double quotes for surrounding.
           { name: name.tr('\'"', '') }
+        else
+          { id: id }
         end
       end
     end

spec/lib/gitlab/markdown/label_reference_filter_spec.rb

@@ -149,5 +149,12 @@ module Gitlab::Markdown
         end
       end
     end
+
+    describe 'edge cases' do
+      it 'gracefully handles non-references matching the pattern' do
+        exp = act = '(format nil "~0f" 3.0) ; 3.0'
+        expect(filter(act).to_html).to eq exp
+     end
+    end
   end
 end