diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-28 17:01:58 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-28 17:01:58 +0000 |
| commit | 387f2c43d31fe940da3b953c6e2b55b2e830d9f2 (patch) | |
| tree | b9655a89933801c35255cc02609627a80d5bed63 /app/views/users | |
| parent | d1067acdd8d96ed0d419f22c4f52722682c55b75 (diff) | |
| parent | e1f1f0c3c88a62151d95a0bd17235d35e95f0554 (diff) | |
| download | gitlab-ce-387f2c43d31fe940da3b953c6e2b55b2e830d9f2.tar.gz | |
Merge branch 'calendar-tooltips' into 'master'
Add tooltip to user's calendar activities
Closes #28925
See merge request !10123
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/calendar_activities.html.haml | 4 |
1 files changed, 2 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 |