diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-02-21 14:21:36 +0300 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-02-21 14:21:36 +0300 |
| commit | 98dbde0c3ffa5c098dd4e765636e0ac3b243d220 (patch) | |
| tree | f2b1ce0c02cde6153505185e36397dddd4ca1a12 /app/assets | |
| parent | cb0c7c3cdb0c860d6676e916027fb5e92522f268 (diff) | |
| parent | 3f2ecb542b4cdd493bfa67f00b94f58b901c62fb (diff) | |
Merge branch 'mind-the-oxford-comma' into 'master'
Mind the oxford comma
See merge request gitlab-org/gitlab-ce!25252
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/pages/users/user_tabs.js | 2 |
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); |