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:
authorRobert Schilling <rschilling@student.tugraz.at>2019-02-14 18:52:49 +0300
committerRobert Schilling <rschilling@student.tugraz.at>2019-02-14 18:52:49 +0300
commit3f2ecb542b4cdd493bfa67f00b94f58b901c62fb (patch)
tree5b6b5155ca1f3b9e573108368bbbec1098270271 /app/assets/javascripts/pages/users/user_tabs.js
parent7a8f8714cc65b36b8dbc4fe180eeb73aa2eeba0f (diff)
Mind the oxford comma
Diffstat (limited to 'app/assets/javascripts/pages/users/user_tabs.js')
-rw-r--r--app/assets/javascripts/pages/users/user_tabs.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/users/user_tabs.js b/app/assets/javascripts/pages/users/user_tabs.js
index 39cd891c111..636308c5401 100644
--- a/app/assets/javascripts/pages/users/user_tabs.js
+++ b/app/assets/javascripts/pages/users/user_tabs.js
@@ -221,7 +221,7 @@ export default class UserTabs {
const monthsAgo = UserTabs.getVisibleCalendarPeriod($calendarWrap);
const calendarActivitiesPath = $calendarWrap.data('calendarActivitiesPath');
const utcOffset = $calendarWrap.data('utcOffset');
- const calendarHint = __('Issues, merge requests, pushes and comments.');
+ const calendarHint = __('Issues, merge requests, pushes, and comments.');
$calendarWrap.html(CALENDAR_TEMPLATE);