Skip to content

G
gitlab-ce
Commit aeb4e34a authored by Kushal Pandya's avatar Kushal Pandya
Browse files
Options

Merge branch 'ee-mind-the-oxford-comma' into 'master' 

Mind the oxford comma

See merge request gitlab-org/gitlab-ee!9559
parents 6dd65037 69229a95
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
app/assets/javascripts/pages/users/user_tabs.js
View file @ aeb4e34a
...@@ -221,7 +221,7 @@ export default class UserTabs { ...@@ -221,7 +221,7 @@ export default class UserTabs {
const monthsAgo = UserTabs.getVisibleCalendarPeriod($calendarWrap); const monthsAgo = UserTabs.getVisibleCalendarPeriod($calendarWrap);
const calendarActivitiesPath = $calendarWrap.data('calendarActivitiesPath'); const calendarActivitiesPath = $calendarWrap.data('calendarActivitiesPath');
const utcOffset = $calendarWrap.data('utcOffset'); 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); $calendarWrap.html(CALENDAR_TEMPLATE);
......
locale/gitlab.pot
View file @ aeb4e34a
...@@ -5415,7 +5415,7 @@ msgstr "" ...@@ -5415,7 +5415,7 @@ msgstr ""
msgid "Issues closed" msgid "Issues closed"
msgstr "" msgstr ""
msgid "Issues, merge requests, pushes and comments." msgid "Issues, merge requests, pushes, and comments."
msgstr "" msgstr ""
msgid "IssuesAnalytics|After you begin creating issues for your projects, we can start tracking and displaying metrics for them" msgid "IssuesAnalytics|After you begin creating issues for your projects, we can start tracking and displaying metrics for them"
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7