summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralex argunov <sajkoooo@gmail.com>2017-03-22 00:06:38 +0300
committeralex argunov <sajkoooo@gmail.com>2017-03-22 22:54:14 +0300
commite1f1f0c3c88a62151d95a0bd17235d35e95f0554 (patch)
treef3f66054758823c6aa14e419d7b1c729b31dd71b
parentcd3e410110a5c6f33c5e873f8fb54883a8e11754 (diff)
downloadgitlab-ce-e1f1f0c3c88a62151d95a0bd17235d35e95f0554.tar.gz
Add tooltip to user's calendar activities
-rw-r--r--app/views/users/calendar_activities.html.haml4
-rw-r--r--changelogs/unreleased/calendar-tooltips.yml4
2 files changed, 6 insertions, 2 deletions
diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml
index 4afd31f788b..d1e88274878 100644
--- a/app/views/users/calendar_activities.html.haml
+++ b/app/views/users/calendar_activities.html.haml
@@ -18,9 +18,9 @@
= event_action_name(event)
%strong
- if event.note?
- = link_to event.note_target.to_reference, event_note_target_path(event)
+ = link_to event.note_target.to_reference, event_note_target_path(event), class: 'has-tooltip', title: event.target_title
- elsif event.target
- = link_to event.target.to_reference, [event.project.namespace.becomes(Namespace), event.project, event.target]
+ = link_to event.target.to_reference, [event.project.namespace.becomes(Namespace), event.project, event.target], class: 'has-tooltip', title: event.target_title
at
%strong
diff --git a/changelogs/unreleased/calendar-tooltips.yml b/changelogs/unreleased/calendar-tooltips.yml
new file mode 100644
index 00000000000..d1517bbab58
--- /dev/null
+++ b/changelogs/unreleased/calendar-tooltips.yml
@@ -0,0 +1,4 @@
+---
+title: Add tooltip to user's calendar activities
+merge_request: 10123
+author: Alex Argunov