Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-19 03:10:43 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-19 03:10:43 +0300
commitaf8443095f27687bea9c0ecdaefe24e4e01ad3b0 (patch)
treea92485b212407977679067f8df8fdc447ae44882 /doc/user
parent039b920db38c464de624710acec581be5a0eb961 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/group/index.md2
-rw-r--r--doc/user/packages/npm_registry/index.md3
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/user/group/index.md b/doc/user/group/index.md
index 6cee893824e..7f2e502b94b 100644
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -261,7 +261,7 @@ In GitLab 13.11, you can [replace this form with a modal window](#share-a-group-
Similar to how you [share a project with a group](../project/members/share_project_with_groups.md),
you can share a group with another group. Members get direct access
-to the shared group. This is not valid for inherited members.
+to the shared group. This includes members who inherited group membership from a parent group.
To share a given group, for example, `Frontend` with another group, for example,
`Engineering`:
diff --git a/doc/user/packages/npm_registry/index.md b/doc/user/packages/npm_registry/index.md
index c5f9d3dd47b..ace432b305f 100644
--- a/doc/user/packages/npm_registry/index.md
+++ b/doc/user/packages/npm_registry/index.md
@@ -14,6 +14,9 @@ packages whenever you need to use them as a dependency.
Only [scoped](https://docs.npmjs.com/misc/scope/) packages are supported.
+For documentation of the specific API endpoints that the npm package manager
+client uses, see the [npm API documentation](../../../api/packages/npm.md).
+
## Build an npm package
This section covers how to install npm or Yarn and build a package for your