From 51eab4133cb97ed88aafa2efa6a02d95633ad874 Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Thu, 18 Oct 2018 12:02:29 +0300 Subject: Use merge request prefix symbol in event feed title --- app/helpers/events_helper.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/helpers/events_helper.rb') diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index c94946a04e7..90851a80b61 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -90,6 +90,10 @@ module EventsHelper elsif event.milestone? words << "##{event.target_iid}" if event.target_iid words << "in" + elsif event.merge_request? + words << "!#{event.target_iid}:" if event.target_iid + words << event.target.title if event.target.respond_to?(:title) + words << "at" elsif event.target words << "##{event.target_iid}:" words << event.target.title if event.target.respond_to?(:title) -- cgit v1.2.3 From 780f51eaf86a613402902668ac40c36fe762d510 Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Tue, 6 Nov 2018 13:36:21 +0200 Subject: Use reference prefix for issues and merge requests in the event feed title --- app/helpers/events_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/helpers/events_helper.rb') diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 90851a80b61..373027c66ec 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -91,11 +91,11 @@ module EventsHelper words << "##{event.target_iid}" if event.target_iid words << "in" elsif event.merge_request? - words << "!#{event.target_iid}:" if event.target_iid + words << "#{Issue.reference_prefix}#{event.target_iid}:" if event.target_iid words << event.target.title if event.target.respond_to?(:title) words << "at" elsif event.target - words << "##{event.target_iid}:" + words << "#{MergeRequest.reference_prefix}#{event.target_iid}:" words << event.target.title if event.target.respond_to?(:title) words << "at" end -- cgit v1.2.3 From fc668d6917f6ef447c5e30d279db3621fa15498f Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Tue, 6 Nov 2018 14:44:47 +0200 Subject: Add issue or merge request reference prefix in the event feed title --- app/helpers/events_helper.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'app/helpers/events_helper.rb') diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 373027c66ec..06e23a03298 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -90,12 +90,15 @@ module EventsHelper elsif event.milestone? words << "##{event.target_iid}" if event.target_iid words << "in" - elsif event.merge_request? - words << "#{Issue.reference_prefix}#{event.target_iid}:" if event.target_iid - words << event.target.title if event.target.respond_to?(:title) - words << "at" elsif event.target - words << "#{MergeRequest.reference_prefix}#{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 -- cgit v1.2.3