Add latest changes from gitlab-org/gitlab@master

4 files changed, 8 insertions, 4 deletions

diff --git a/doc/administration/logs.md b/doc/administration/logs.md
index 51d5c758084..b98f02ccc98 100644
--- a/doc/administration/logs.md
+++ b/doc/administration/logs.md
@@ -288,10 +288,13 @@ For source installations, edit the `gitlab.yml` and set the Sidekiq
 
 ## `gitlab-shell.log`
 
-This file lives in `/var/log/gitlab/gitlab-shell/gitlab-shell.log` for
-Omnibus GitLab packages or in `/home/git/gitlab-shell/gitlab-shell.log` for
+This file lives in `/var/log/gitlab/gitaly/gitlab-shell.log` for
+Omnibus GitLab packages or in `/home/git/gitaly/gitlab-shell.log` for
 installations from source.
 
+NOTE: **Note**
+For GitLab 12.5 and earlier the file lives in `/var/log/gitlab/gitlab-shell/gitlab-shell.log`.
+
 GitLab Shell is used by GitLab for executing Git commands and provide
 SSH access to Git repositories. For example:
 
diff --git a/doc/api/issue_links.md b/doc/api/issue_links.md
index 941cc0b1347..2a64c2370fc 100644
--- a/doc/api/issue_links.md
+++ b/doc/api/issue_links.md
@@ -67,7 +67,7 @@ POST /projects/:id/issues/:issue_iid/links
 | `issue_iid` | integer | yes      | The internal ID of a project's issue |
 | `target_project_id` | integer/string | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) of a target project  |
 | `target_issue_iid` | integer/string | yes      | The internal ID of a target project's issue |
-| `link_type` | string  | no | The type of the relation ("relates_to", "blocks", "is_blocked_by"), defaults to "relates_to"). Ignored unless `issue_link_types` feature flag is enabled. |
+| `link_type` | string  | no | The type of the relation ("relates_to", "blocks", "is_blocked_by"), defaults to "relates_to"). |
 
 ```shell
 curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/4/issues/1/links?target_project_id=5&target_issue_iid=1"
diff --git a/doc/development/integrations/secure.md.md b/doc/development/integrations/secure.md
index b9b37a7e298..b9b37a7e298 100644
--- a/doc/development/integrations/secure.md.md
+++ b/doc/development/integrations/secure.md
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 25672d510c7..41040258e01 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -95,7 +95,7 @@ The following table depicts the various user permission levels in a project.
 | Stop environments                                 |         |            | ✓           | ✓        | ✓      |
 | Add tags                                          |         |            | ✓           | ✓        | ✓      |
 | Cancel and retry jobs                             |         |            | ✓           | ✓        | ✓      |
-| Create or update commit status                    |         |            | ✓           | ✓        | ✓      |
+| Create or update commit status                    |         |            | ✓ (*5*)     | ✓        | ✓      |
 | Update a container registry                       |         |            | ✓           | ✓        | ✓      |
 | Remove a container registry image                 |         |            | ✓           | ✓        | ✓      |
 | Create/edit/delete project milestones             |         |            | ✓           | ✓        | ✓      |
@@ -144,6 +144,7 @@ The following table depicts the various user permission levels in a project.
 (*2*): Guest users can only view the confidential issues they created themselves.  
 (*3*): If **Public pipelines** is enabled in **Project Settings > CI/CD**.  
 (*4*): Not allowed for Guest, Reporter, Developer, Maintainer, or Owner. See [Protected Branches](./project/protected_branches.md).
+(*5*): If the [branch is protected](./project/protected_branches.md#using-the-allowed-to-merge-and-allowed-to-push-settings), this depends on the access Developers and Maintainers are given.
 
 ## Project features permissions