From 8fb943c7df5f2b399caaeaebd6c00d0630bc763c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 2 Mar 2020 06:08:01 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 doc/ci/caching/index.md | 13 +++++++------
 doc/integration/saml.md |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'doc')

diff --git a/doc/ci/caching/index.md b/doc/ci/caching/index.md
index 0109d87921b..a60310076a8 100644
--- a/doc/ci/caching/index.md
+++ b/doc/ci/caching/index.md
@@ -206,10 +206,11 @@ templates](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/lib/gitlab/ci/t
 
 ### Caching Node.js dependencies
 
-Assuming your project is using [npm](https://www.npmjs.com/) or
-[Yarn](https://classic.yarnpkg.com/en/) to install the Node.js dependencies, the
-following example defines `cache` globally so that all jobs inherit it.
-Node.js modules are installed in `node_modules/` and are cached per-branch:
+Assuming your project is using [npm](https://www.npmjs.com/) to install the Node.js
+dependencies, the following example defines `cache` globally so that all jobs inherit it.
+By default, npm stores cache data in the home folder `~/.npm` but since
+[you can't cache things outside of the project directory](../yaml/README.md#cachepaths),
+we tell npm to use `./.npm` instead, and it is cached per-branch:
 
 ```yaml
 #
@@ -221,10 +222,10 @@ image: node:latest
 cache:
   key: ${CI_COMMIT_REF_SLUG}
   paths:
-  - node_modules/
+  - .npm/
 
 before_script:
-  - npm install
+  - npm ci --cache .npm --prefer-offline
 
 test_async:
   script:
diff --git a/doc/integration/saml.md b/doc/integration/saml.md
index 31d41433e6b..001e2883de0 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -188,7 +188,7 @@ tell GitLab which groups are external via the `external_groups:` element:
         } }
 ```
 
-## Required groups
+## Required groups **(STARTER ONLY)**
 
 >**Note:**
 This setting is only available on GitLab 10.2 EE and above.
@@ -215,7 +215,7 @@ Example:
         } }
 ```
 
-## Admin Groups
+## Admin Groups **(STARTER ONLY)**
 
 >**Note:**
 This setting is only available on GitLab 8.8 EE and above.
@@ -239,7 +239,7 @@ considered `admin groups`.
         } }
 ```
 
-## Auditor Groups
+## Auditor Groups **(STARTER ONLY)**
 
 >**Note:**
 This setting is only available on GitLab 11.4 EE and above.
-- 
cgit v1.2.1