Merge branch 'ext-issue-7-12' into '7-12-stable'

!794 for 7-12-stable

Brings !794 to 7-12-stable.

cc @jacobvosmaer

See merge request !826

CHANGELOG

@@ -15,6 +15,7 @@ v 7.12.0 (unreleased)
   - Disable changing of target branch in new merge request page when a branch has already been specified (Stan Hu)
   - Fix post-receive errors on a push when an external issue tracker is configured (Stan Hu)
   - Update oauth button logos for Twitter and Google to recommended assets
+  - Fix hooks for web based events with external issue references (Daniel Gerhardt)
   - Update browser gem to version 0.8.0 for IE11 support (Stan Hu)
   - Fix timeout when rendering file with thousands of lines.
   - Add "Remember me" checkbox to LDAP signin form.

app/services/system_note_service.rb

@@ -212,13 +212,15 @@ def self.cross_reference?(note_text)
   # Check if a cross-reference is disallowed
   #
   # This method prevents adding a "mentioned in !1" note on every single commit
-  # in a merge request.
+  # in a merge request. Additionally, it prevents the creation of references to
+  # external issues (which would fail).
   #
   # noteable  - Noteable object being referenced
   # mentioner - Mentionable object
   #
   # Returns Boolean
   def self.cross_reference_disallowed?(noteable, mentioner)
+    return true if noteable.is_a?(ExternalIssue)
     return false unless mentioner.is_a?(MergeRequest)
     return false unless noteable.is_a?(Commit)

spec/services/system_note_service_spec.rb

@@ -338,6 +338,15 @@
           to be_falsey
       end
     end
+
+    context 'when notable is an ExternalIssue' do
+      let(:noteable) { ExternalIssue.new('EXT-1234', project) }
+      it 'is truthy' do
+        mentioner = noteable.dup
+        expect(described_class.cross_reference_disallowed?(noteable, mentioner)).
+          to be_truthy
+      end
+    end
   end
   describe '.cross_reference_exists?' do