Add latest changes from gitlab-org/gitlab@master

4 files changed, 11 insertions, 12 deletions

diff --git a/doc/api/group_activity_analytics.md b/doc/api/group_activity_analytics.md
index 2e93967fe64..23dcb46dbc5 100644
--- a/doc/api/group_activity_analytics.md
+++ b/doc/api/group_activity_analytics.md
@@ -23,9 +23,7 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/ap
 Example response:
 
 ```json
-[
-  { issues_count : 10 }
-]
+{ "issues_count": 10 }
 ```
 
 ## Get count of recently created merge requests for group
@@ -49,7 +47,5 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/ap
 Example response:
 
 ```json
-[
-  { merge_requests_count : 10 }
-]
+{ "merge_requests_count": 10 }
 ```
diff --git a/doc/api/projects.md b/doc/api/projects.md
index a00bd442872..ae9f7de427d 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -1012,6 +1012,7 @@ POST /projects
 | `issues_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `repository_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `merge_requests_access_level` | string | no | One of `disabled`, `private` or `enabled` |
+| `forking_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `builds_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `wiki_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `snippets_access_level` | string | no | One of `disabled`, `private` or `enabled` |
@@ -1080,6 +1081,7 @@ POST /projects/user/:user_id
 | `issues_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `repository_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `merge_requests_access_level` | string | no | One of `disabled`, `private` or `enabled` |
+| `forking_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `builds_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `wiki_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `snippets_access_level` | string | no | One of `disabled`, `private` or `enabled` |
@@ -1147,6 +1149,7 @@ PUT /projects/:id
 | `issues_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `repository_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `merge_requests_access_level` | string | no | One of `disabled`, `private` or `enabled` |
+| `forking_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `builds_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `wiki_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `snippets_access_level` | string | no | One of `disabled`, `private` or `enabled` |
diff --git a/doc/ci/caching/index.md b/doc/ci/caching/index.md
index a60310076a8..4e2e61cfadf 100644
--- a/doc/ci/caching/index.md
+++ b/doc/ci/caching/index.md
@@ -202,7 +202,7 @@ so they don't have to be re-fetched from the public internet.
 
 NOTE: **Note:**
 For more examples, check out our [GitLab CI/CD
-templates](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/lib/gitlab/ci/templates).
+templates](https://gitlab.com/gitlab-org/gitlab/tree/master/lib/gitlab/ci/templates).
 
 ### Caching Node.js dependencies
 
@@ -214,7 +214,7 @@ we tell npm to use `./.npm` instead, and it is cached per-branch:
 
 ```yaml
 #
-# https://gitlab.com/gitlab-org/gitlab-foss/tree/master/lib/gitlab/ci/templates/Nodejs.gitlab-ci.yml
+# https://gitlab.com/gitlab-org/gitlab/tree/master/lib/gitlab/ci/templates/Nodejs.gitlab-ci.yml
 #
 image: node:latest
 
@@ -241,7 +241,7 @@ are cached per-branch:
 
 ```yaml
 #
-# https://gitlab.com/gitlab-org/gitlab-foss/tree/master/lib/gitlab/ci/templates/PHP.gitlab-ci.yml
+# https://gitlab.com/gitlab-org/gitlab/tree/master/lib/gitlab/ci/templates/PHP.gitlab-ci.yml
 #
 image: php:7.2
 
@@ -270,7 +270,7 @@ pip's cache is defined under `.cache/pip/` and both are cached per-branch:
 
 ```yaml
 #
-# https://gitlab.com/gitlab-org/gitlab-foss/tree/master/lib/gitlab/ci/templates/Python.gitlab-ci.yml
+# https://gitlab.com/gitlab-org/gitlab/tree/master/lib/gitlab/ci/templates/Python.gitlab-ci.yml
 #
 image: python:latest
 
@@ -310,7 +310,7 @@ jobs inherit it. Gems are installed in `vendor/ruby/` and are cached per-branch:
 
 ```yaml
 #
-# https://gitlab.com/gitlab-org/gitlab-foss/tree/master/lib/gitlab/ci/templates/Ruby.gitlab-ci.yml
+# https://gitlab.com/gitlab-org/gitlab/tree/master/lib/gitlab/ci/templates/Ruby.gitlab-ci.yml
 #
 image: ruby:2.6
 
diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
index 6dbc8f98247..ca980bb58c3 100644
--- a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
+++ b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
@@ -45,7 +45,7 @@ In addition, pipelines for merged results have the following limitations:
   see [#11934](https://gitlab.com/gitlab-org/gitlab/issues/11934).
 - This feature is not available for
   [fast forward merges](../../../user/project/merge_requests/fast_forward_merge.md) yet.
-  To follow progress, see [#58226](https://gitlab.com/gitlab-org/gitlab-foss/issues/58226).
+  To follow progress, see [#58226](https://gitlab.com/gitlab-org/gitlab/-/issues/26996).
 
 ## Enabling Pipelines for Merged Results