Add latest changes from gitlab-org/gitlab@master

7 files changed, 8 insertions, 5 deletions

diff --git a/doc/administration/audit_events.md b/doc/administration/audit_events.md
index d5e141459b6..7d3be9e1bd3 100644
--- a/doc/administration/audit_events.md
+++ b/doc/administration/audit_events.md
@@ -18,7 +18,7 @@ permission level, who added a new user, or who removed a user.
 
 ## Use-cases
 
-- Check who was the person who changed the permission level of a particular
+- Check who the person was that changed the permission level of a particular
   user for a project in GitLab.
 - Use it to track which users have access to a certain group of projects
   in  GitLab, and who gave them that permission level.
diff --git a/doc/api/error_tracking.md b/doc/api/error_tracking.md
index 77dc7f8629f..3c1fbb7dc7a 100644
--- a/doc/api/error_tracking.md
+++ b/doc/api/error_tracking.md
@@ -24,6 +24,7 @@ Example response:
 
 ```json
 {
+  "active": true,
   "project_name": "sample sentry project",
   "sentry_external_url": "https://sentry.io/myawesomeproject/project",
   "api_url": "https://sentry.io/api/0/projects/myawesomeproject/project"
diff --git a/doc/api/merge_request_approvals.md b/doc/api/merge_request_approvals.md
index f98fb7a5a0d..4552a56d808 100644
--- a/doc/api/merge_request_approvals.md
+++ b/doc/api/merge_request_approvals.md
@@ -762,7 +762,7 @@ will be used.
 You can update merge request approval rules using the following endpoint:
 
 ```
-PUT /projects/:id/merge_request/:merge_request_iid/approval_rules/:approval_rule_id
+PUT /projects/:id/merge_requests/:merge_request_iid/approval_rules/:approval_rule_id
 ```
 
 **Important:** Approvers and groups not in the `users`/`groups` param will be **removed**
diff --git a/doc/user/application_security/dependency_scanning/index.md b/doc/user/application_security/dependency_scanning/index.md
index 2a11f7a1b7c..c47fd6f1ff1 100644
--- a/doc/user/application_security/dependency_scanning/index.md
+++ b/doc/user/application_security/dependency_scanning/index.md
@@ -65,6 +65,7 @@ The following languages and dependency managers are supported.
 | Python ([poetry](https://poetry.eustace.io/)) | not currently ([issue](https://gitlab.com/gitlab-org/gitlab/issues/7006 "Support Poetry in Dependency Scanning")) | not available |
 | Ruby ([gem](https://rubygems.org/)) | yes | [gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium), [bundler-audit](https://github.com/rubysec/bundler-audit) |
 | Scala ([sbt](https://www.scala-sbt.org/)) | yes | [gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) |
+| Go ([go](https://golang.org/)) | yes (alpha) | [gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) |
 
 ## Configuration
 
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index f5116f22cd8..6016837a769 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -460,11 +460,11 @@ You can also use following variables besides static text:
 | `%{file_path}` | The path of the file the Suggestion is applied to. | `docs/index.md` |
 | `%{branch_name}` | The name of the branch the Suggestion is applied on. | `my-feature-branch` |
 | `%{username}` | The username of the user applying the Suggestion. | `user_1` |
-| `%{user_full_name}` | The full name of the user applying the Suggestion. | `**User 1** |
+| `%{user_full_name}` | The full name of the user applying the Suggestion. | **User 1** |
 
 For example, to customize the commit message to output
 **Addresses user_1's review**, set the custom text to
-`Adresses %{username}'s review`.
+`Addresses %{username}'s review`.
 
 NOTE: **Note:**
 Custom commit messages for each applied Suggestion will be
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 2b26565018f..985c1babdb5 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -66,6 +66,7 @@ The following table depicts the various user permission levels in a project.
 | View confidential issues                          | (*2*)   | ✓          | ✓           | ✓        | ✓      |
 | Assign issues                                     |         | ✓          | ✓           | ✓        | ✓      |
 | Label issues                                      |         | ✓          | ✓           | ✓        | ✓      |
+| Set issue weight                                  |         | ✓          | ✓           | ✓        | ✓      |
 | Lock issue threads                                |         | ✓          | ✓           | ✓        | ✓      |
 | Manage issue tracker                              |         | ✓          | ✓           | ✓        | ✓      |
 | Manage related issues **(STARTER)**               |         | ✓          | ✓           | ✓        | ✓      |
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index 9449ab6d10f..f5cfa256f5d 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -100,7 +100,7 @@ For more details on the specific data persisted in a project export, see the
    ![Email download link](img/import_export_mail_link.png)
 
 1. Alternatively, you can come back to the project settings and download the
-   file from there, or generate a new export. Once the file available, the page
+   file from there, or generate a new export. Once the file is available, the page
    should show the **Download export** button:
 
    ![Download export](img/import_export_download_export.png)