fixed conflict and comment

2 files changed, 33 insertions, 3 deletions

diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md
index e29ee2a7b3d..22b9be059d6 100644
--- a/doc/update/patch_versions.md
+++ b/doc/update/patch_versions.md
@@ -22,6 +22,7 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
 ```bash
 cd /home/git/gitlab
 sudo -u git -H git fetch --all
+sudo -u git -H git checkout -- Gemfile.lock db/schema.rb
 sudo -u git -H git checkout LATEST_TAG
 ```
 
diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md
index a079a5ddf66..32b515ca238 100644
--- a/doc/workflow/notifications.md
+++ b/doc/workflow/notifications.md
@@ -52,11 +52,9 @@ Below is the table of events users can be notified of:
 | New SSH key added            | User                                                              | Security email, always sent. |
 | New email added              | User                                                              | Security email, always sent. |
 | New user created             | User                                                              | Sent on user creation, except for omniauth (LDAP)|
-| New issue created            | Issue assignee [1], project members [2]                           | [1] not disabled, [2] higher than participating |
 | User added to project        | User                                                              | Sent when user is added to project |
 | Project access level changed | User                                                              | Sent when user project access level is changed |
 | User added to group          | User                                                              | Sent when user is added to group |
-| Project moved                | Project members [1]                                               | [1] not disabled |
 | Group access level changed   | User                                                              | Sent when user group access level is changed |
 | Close issue                  | Issue author [1], issue assignee [2], project members [3]         | [1] [2] not disabled, [3] higher than participating |
 | Reassign issue               | New issue assignee [1], old issue assignee [2]                    | [1] [2] not disabled |
@@ -67,5 +65,36 @@ Below is the table of events users can be notified of:
 | Reopen merge request         | Project members [1]                                               | [1] higher than participating |
 | Merge merge request          | MR author [1], MR assignee [2], project members [3]               | [1] [2] not disabled, [3] higher than participating |
 | New comment                  | Mentioned users [1], users participating [2], project members [3] | [1] [2] not disabled, [3] higher than participating |
+| Project moved                | Project members [1]                                               | [1] not disabled |
 
-You won't receive notifications for Issues, Merge Requests or Milestones created by yourself. You will only receive automatic notifications when somebody else creates one and they mention you. Also, when somebody comments or adds changes to the ones that you've created. 
+### Issue / Merge Request events
+
+In all of the below cases, the notification will be sent to:
+- Participants:
+  - the author and assignee of the issue/merge request
+  - authors of comments on the issue/merge request
+  - anyone mentioned by `@username` in the issue/merge request description
+  - anyone mentioned by `@username` in any of the comments on the issue/merge request
+
+    ...with notification level "Participating" or higher
+
+- Watchers: project members with notification level "Watch"
+- Subscribers: anyone who manually subscribed to the issue/merge request
+
+| Event                  | Sent to |
+|------------------------|---------|
+| New issue              | |
+| Close issue            | |
+| Reassign issue         | The above, plus the old assignee |
+| Reopen issue           | |
+| New merge request      | |
+| Reassign merge request | The above, plus the old assignee |
+| Close merge request    | |
+| Reopen merge request   | |
+| Merge merge request    | |
+| New comment            | The above, plus anyone mentioned by `@username` in the comment, with notification level "Mention" or higher |
+
+You won't receive notifications for Issues, Merge Requests or Milestones
+created by yourself. You will only receive automatic notifications when
+somebody else comments or adds changes to the ones that you've created or
+mentions you.