Merge branch 'gt-use-merge-request-prefix-in-event-feed-title' into 'master'

Use merge request prefix symbol in event feed title

Closes #36267

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

app/helpers/events_helper.rb

@@ -91,7 +91,14 @@ module EventsHelper
       words << "##{event.target_iid}" if event.target_iid
       words << "in"
     elsif event.target
-      words << "##{event.target_iid}:"
+      prefix =
+        if event.merge_request?
+          MergeRequest.reference_prefix
+        else
+          Issue.reference_prefix
+        end
+
+      words << "#{prefix}#{event.target_iid}:" if event.target_iid
       words << event.target.title if event.target.respond_to?(:title)
       words << "at"
     end

changelogs/unreleased/gt-use-merge-request-prefix-in-event-feed-title.yml

+---
+title: Use merge request prefix symbol in event feed title
+merge_request: 22449
+author: George Tsiolis
+type: changed

spec/helpers/events_helper_spec.rb

@@ -2,18 +2,18 @@ require 'spec_helper'
 
 describe EventsHelper do
   describe '#event_commit_title' do
-    let(:message) { "foo & bar " + "A" * 70 + "\n" + "B" * 80 }
+    let(:message) { 'foo & bar ' + 'A' * 70 + '\n' + 'B' * 80 }
     subject { helper.event_commit_title(message) }
 
-    it "returns the first line, truncated to 70 chars" do
+    it 'returns the first line, truncated to 70 chars' do
       is_expected.to eq(message[0..66] + "...")
     end
 
-    it "is not html-safe" do
+    it 'is not html-safe' do
       is_expected.not_to be_a(ActiveSupport::SafeBuffer)
     end
 
-    it "handles empty strings" do
+    it 'handles empty strings' do
       expect(helper.event_commit_title("")).to eq("")
     end
 
@@ -22,7 +22,7 @@ describe EventsHelper do
     end
 
     it 'does not escape HTML entities' do
-      expect(helper.event_commit_title("foo & bar")).to eq("foo & bar")
+      expect(helper.event_commit_title('foo & bar')).to eq('foo & bar')
     end
   end
 
@@ -30,38 +30,54 @@ describe EventsHelper do
     let(:event) { create(:event) }
     let(:project) { create(:project, :public, :repository) }
 
-    it "returns project issue url" do
+    context 'issue' do
+      before do
         event.target = create(:issue)
+      end
+
+      it 'returns the project issue url' do
+        expect(helper.event_feed_url(event)).to eq(project_issue_url(event.project, event.target))
+      end
 
-      expect(helper.event_feed_url(event)).to eq(project_issue_url(event.project, event.issue))
+      it 'contains the project issue IID link' do
+        expect(helper.event_feed_title(event)).to include("##{event.target.iid}")
+      end
     end
 
-    it "returns project merge_request url" do
+    context 'merge request' do
+      before do
         event.target = create(:merge_request)
+      end
+
+      it 'returns the project merge request url' do
+        expect(helper.event_feed_url(event)).to eq(project_merge_request_url(event.project, event.target))
+      end
 
-      expect(helper.event_feed_url(event)).to eq(project_merge_request_url(event.project, event.merge_request))
+      it 'contains the project merge request IID link' do
+        expect(helper.event_feed_title(event)).to include("!#{event.target.iid}")
+      end
     end
 
-    it "returns project commit url" do
+    it 'returns project commit url' do
       event.target = create(:note_on_commit, project: project)
 
       expect(helper.event_feed_url(event)).to eq(project_commit_url(event.project, event.note_target))
     end
 
-    it "returns event note target url" do
+    it 'returns event note target url' do
       event.target = create(:note)
 
       expect(helper.event_feed_url(event)).to eq(event_note_target_url(event))
     end
 
-    it "returns project url" do
+    it 'returns project url' do
       event.project = project
       event.action = 1
 
       expect(helper.event_feed_url(event)).to eq(project_url(event.project))
     end
 
-    it "returns push event feed url" do
+    it 'returns push event feed url' do
       event = create(:push_event)
       create(:push_event_payload, event: event, action: :pushed)