Commit f7411b9a authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'ab-fix-timeline-tooltip' into 'master'

Updating timeline tooltip and icon

See merge request gitlab-org/gitlab!84032
parents e8b272c9 874c3544
...@@ -7,8 +7,8 @@ import { COMMENTS_ONLY_FILTER_VALUE, DESC } from '../constants'; ...@@ -7,8 +7,8 @@ import { COMMENTS_ONLY_FILTER_VALUE, DESC } from '../constants';
import notesEventHub from '../event_hub'; import notesEventHub from '../event_hub';
import { trackToggleTimelineView } from '../utils'; import { trackToggleTimelineView } from '../utils';
export const timelineEnabledTooltip = s__('Timeline|Turn timeline view off'); export const timelineEnabledTooltip = s__('Timeline|Turn recent updates view off');
export const timelineDisabledTooltip = s__('Timeline|Turn timeline view on'); export const timelineDisabledTooltip = s__('Timeline|Turn recent updates view on');
export default { export default {
components: { components: {
...@@ -49,7 +49,7 @@ export default { ...@@ -49,7 +49,7 @@ export default {
<gl-button <gl-button
v-gl-tooltip v-gl-tooltip
v-track-event="trackToggleTimelineView(timelineEnabled)" v-track-event="trackToggleTimelineView(timelineEnabled)"
icon="comments" icon="history"
:selected="timelineEnabled" :selected="timelineEnabled"
:title="tooltip" :title="tooltip"
:aria-label="tooltip" :aria-label="tooltip"
......
...@@ -169,7 +169,7 @@ Beneath the highlight bar, GitLab displays a summary that includes the following ...@@ -169,7 +169,7 @@ Beneath the highlight bar, GitLab displays a summary that includes the following
- Monitoring tool - Monitoring tool
Comments are displayed in threads, but can be displayed chronologically Comments are displayed in threads, but can be displayed chronologically
[in a timeline view](#timeline-view). [by toggling on the recent updates view](#recent-updates-view).
### Metrics **(PREMIUM)** ### Metrics **(PREMIUM)**
...@@ -195,15 +195,15 @@ field populated. ...@@ -195,15 +195,15 @@ field populated.
![Incident alert details](img/incident_alert_details_v13_4.png) ![Incident alert details](img/incident_alert_details_v13_4.png)
### Timeline view **(PREMIUM)** ### Recent updates view **(PREMIUM)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/227836) in GitLab 13.5. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/227836) in GitLab 13.5.
To quickly see the latest updates on an incident, click To quickly see the latest updates on an incident, click
**{comments}** **Turn timeline view on** in the comment bar to display comments **{history}** **Turn recent updates view on** in the comment bar to display comments
un-threaded and ordered chronologically, newest to oldest: un-threaded and ordered chronologically, newest to oldest:
![Timeline view toggle](img/timeline_view_toggle_v13_5.png) ![Recent updates view toggle](img/timeline_view_toggle_v14_10.png)
### Service Level Agreement countdown timer **(PREMIUM)** ### Service Level Agreement countdown timer **(PREMIUM)**
......
...@@ -39127,10 +39127,10 @@ msgstr "" ...@@ -39127,10 +39127,10 @@ msgstr ""
msgid "Timeago|right now" msgid "Timeago|right now"
msgstr "" msgstr ""
msgid "Timeline|Turn timeline view off" msgid "Timeline|Turn recent updates view off"
msgstr "" msgstr ""
msgid "Timeline|Turn timeline view on" msgid "Timeline|Turn recent updates view on"
msgstr "" msgstr ""
msgid "Timeout" msgid "Timeout"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment