Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-04-04 18:09:26 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-04-04 18:09:26 +0300
commitcad0cc33957b0ea82afb34836e42419bea5a99b9 (patch)
tree55f30a2cd2e8fde03e39c77b2fe4a4a3e2a1bb93 /app/assets/javascripts/notes
parent13f961dce9cbed0a684d694fb1cb9d85946e3be4 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
-rw-r--r--app/assets/javascripts/notes/components/timeline_toggle.vue6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/components/timeline_toggle.vue b/app/assets/javascripts/notes/components/timeline_toggle.vue
index 87d22e5b986..e4d89f54652 100644
--- a/app/assets/javascripts/notes/components/timeline_toggle.vue
+++ b/app/assets/javascripts/notes/components/timeline_toggle.vue
@@ -7,8 +7,8 @@ import { COMMENTS_ONLY_FILTER_VALUE, DESC } from '../constants';
import notesEventHub from '../event_hub';
import { trackToggleTimelineView } from '../utils';
-export const timelineEnabledTooltip = s__('Timeline|Turn timeline view off');
-export const timelineDisabledTooltip = s__('Timeline|Turn timeline view on');
+export const timelineEnabledTooltip = s__('Timeline|Turn recent updates view off');
+export const timelineDisabledTooltip = s__('Timeline|Turn recent updates view on');
export default {
components: {
@@ -49,7 +49,7 @@ export default {
<gl-button
v-gl-tooltip
v-track-event="trackToggleTimelineView(timelineEnabled)"
- icon="comments"
+ icon="history"
:selected="timelineEnabled"
:title="tooltip"
:aria-label="tooltip"