Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Tsiolis <tsiolis.g@gmail.com>2018-10-18 12:02:29 +0300
committerGeorge Tsiolis <tsiolis.g@gmail.com>2018-11-06 15:40:16 +0300
commit51eab4133cb97ed88aafa2efa6a02d95633ad874 (patch)
treedac0d068925ae6236491f0561298cc9848120ae4
parent1cf4aa023978cfb28e73058e66e7d16d864e6f5a (diff)
Use merge request prefix symbol in event feed title
-rw-r--r--app/helpers/events_helper.rb4
-rw-r--r--changelogs/unreleased/gt-use-merge-request-prefix-in-event-feed-title.yml5
2 files changed, 9 insertions, 0 deletions
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)
diff --git a/changelogs/unreleased/gt-use-merge-request-prefix-in-event-feed-title.yml b/changelogs/unreleased/gt-use-merge-request-prefix-in-event-feed-title.yml
new file mode 100644
index 00000000000..8e3e1c922bf
--- /dev/null
+++ b/changelogs/unreleased/gt-use-merge-request-prefix-in-event-feed-title.yml
@@ -0,0 +1,5 @@
+---
+title: Use merge request prefix symbol in event fetitle
+merge_request: 22449
+author: George Tsiolis
+type: changed