summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorconnorshea <connor.james.shea@gmail.com>2016-04-08 13:32:17 -0600
committerconnorshea <connor.james.shea@gmail.com>2016-04-08 13:32:17 -0600
commit6a0f839941ae367cb542fd59685b8f394f59fe75 (patch)
treececcb5dd2e2bd5d66bbf389e4f1bc59a030617d8 /app/views
parent0d216c194c5a7b72c98f0f06b4fc7fd0ba358c0e (diff)
downloadgitlab-ce-6a0f839941ae367cb542fd59685b8f394f59fe75.tar.gz
Add a missing Oxford comma in some text on the Activity graph.
Resolves #14668. [ci skip]
Diffstat (limited to 'app/views')
-rw-r--r--app/views/users/calendar.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/users/calendar.html.haml b/app/views/users/calendar.html.haml
index 7f29918dba3..1de71f37d1a 100644
--- a/app/views/users/calendar.html.haml
+++ b/app/views/users/calendar.html.haml
@@ -7,4 +7,4 @@
'#{user_calendar_activities_path}'
);
-.calendar-hint Summary of issues, merge requests and push events
+.calendar-hint Summary of issues, merge requests, and push events