diff options
author | Stan Hu <stanhu@gmail.com> | 2015-08-30 21:51:34 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2015-09-15 05:51:11 -0700 |
commit | d3d03d1362e576d194782a655cdfe9bc6ed5c596 (patch) | |
tree | 0b720ea7ac0b5df7e968df83ce25d8e571617a56 /app/helpers/events_helper.rb | |
parent | 080a086d7644285af6cd4fb4b51c8f1c9b3aec95 (diff) | |
download | gitlab-ce-d3d03d1362e576d194782a655cdfe9bc6ed5c596.tar.gz |
Create a "destroyed Milestone" event and keep Milestone events around in the DB
for posterity.
Also fix issue where destroying a Milestone would cause odd, transient messages like
"created milestone" or "imported milestone".
Add "in" preposition when creating and destroying milestones
Closes #2382
Diffstat (limited to 'app/helpers/events_helper.rb')
-rw-r--r-- | app/helpers/events_helper.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 76602614bcd..6f69c2a9f32 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -46,6 +46,14 @@ module EventsHelper } end + def event_preposition(event) + if event.push? || event.commented? || event.target + "at" + elsif event.milestone? + "in" + end + end + def event_feed_title(event) words = [] words << event.author_name @@ -62,6 +70,9 @@ module EventsHelper words << "##{truncate event.note_target_iid}" end words << "at" + elsif event.milestone? + words << "##{event.target_iid}" if event.target_iid + words << "in" elsif event.target words << "##{event.target_iid}:" words << event.target.title if event.target.respond_to?(:title) |