summaryrefslogtreecommitdiff
path: root/app/views/events
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-09-17 08:04:37 +0000
committerStan Hu <stanhu@gmail.com>2015-09-17 08:04:37 +0000
commitf4816372457c3b513f8707efd87ce34c9922177c (patch)
tree534be1d81e56da85514b88dd47fde25a7cf093f1 /app/views/events
parent2e9a7032cec02588484eb162717298d311770c7d (diff)
parentd3d03d1362e576d194782a655cdfe9bc6ed5c596 (diff)
downloadgitlab-ce-f4816372457c3b513f8707efd87ce34c9922177c.tar.gz
Merge branch 'fix-issue-2382' into 'master'
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". Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png) Closes #2382 See merge request !1227
Diffstat (limited to 'app/views/events')
-rw-r--r--app/views/events/event/_common.html.haml5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index a39e62e9dac..4ecf1c33d2a 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -5,13 +5,14 @@
- if event.target
%strong= link_to "##{event.target_iid}", [event.project.namespace.becomes(Namespace), event.project, event.target]
- at
+
+ = event_preposition(event)
- if event.project
= link_to_project event.project
- else
= event.project_name
-
+
- if event.target.respond_to?(:title)
.event-body
.event-note