summaryrefslogtreecommitdiff
path: root/doc/workflow
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-25 06:06:19 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-25 06:06:19 +0000
commit8f8838a1d9d045fd75cfa70c4f7daa4f080084e9 (patch)
tree5452c715417625620afb7474ab036d5bf24f04ae /doc/workflow
parent543081566d10160511ef09e929195ef3f48f5fa3 (diff)
downloadgitlab-ce-8f8838a1d9d045fd75cfa70c4f7daa4f080084e9.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/workflow')
-rw-r--r--doc/workflow/notifications.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md
index d619c870c5e..814accf3670 100644
--- a/doc/workflow/notifications.md
+++ b/doc/workflow/notifications.md
@@ -51,8 +51,8 @@ Organization like this is suitable for users that belong to different groups but
same need for being notified for every group they are member of.
These settings can be configured on group page under the name of the group. It will be the dropdown with the bell icon. They can also be configured on the user profile notifications dropdown.
-The group owner can disable email notifications for a group, which also includes
-it's subgroups and projects. If this is the case, you will not receive any corresponding notifications,
+The group owner can disable email notifications for a group, which includes
+its subgroups and projects. If this is the case, you will not receive any corresponding notifications,
and the notification button will be disabled with an explanatory tooltip.
### Project Settings
@@ -64,7 +64,7 @@ other setting.
This is suitable for users that have different needs for notifications per project basis.
These settings can be configured on project page under the name of the project. It will be the dropdown with the bell icon. They can also be configured on the user profile notifications dropdown.
-The project owner (or it's group owner) can disable email notifications for the project.
+The project owner (or its group owner) can disable email notifications for the project.
If this is the case, you will not receive any corresponding notifications, and the notification
button will be disabled with an explanatory tooltip.