Add latest changes from gitlab-org/gitlab@master

2 files changed, 29 insertions, 20 deletions

diff --git a/doc/ci/environments/index.md b/doc/ci/environments/index.md
index e647a704a87..9e7855ef826 100644
--- a/doc/ci/environments/index.md
+++ b/doc/ci/environments/index.md
@@ -31,7 +31,8 @@ Prerequisites:
 
 To view a list of environments and deployments:
 
-1. Go to the project's **Deployments > Environments** page.
+1. On the top bar, select **Menu > Projects** and find your project.
+1. On the left sidebar, select **Deployments > Environments**.
    The environments are displayed.
 
    ![Environments list](img/environments_list.png)
@@ -57,7 +58,8 @@ You can create an environment and deployment in the UI or in your `.gitlab-ci.ym
 
 In the UI:
 
-1. Go to the project's **Deployments > Environments** page.
+1. On the top bar, select **Menu > Projects** and find your project.
+1. On the left sidebar, select **Deployments > Environments**.
 1. Select **New environment**.
 1. Enter a name and external URL.
 1. Select **Save**.
@@ -326,7 +328,8 @@ If there is a problem with a deployment, you can retry it or roll it back.
 
 To retry or rollback a deployment:
 
-1. Go to the project's **Deployments > Environments**.
+1. On the top bar, select **Menu > Projects** and find your project.
+1. On the left sidebar, select **Deployments > Environments**.
 1. Select the environment.
 1. To the right of the deployment name:
    - To retry a deployment, select **Re-deploy to environment**.
@@ -465,7 +468,8 @@ GitLab automatically triggers the `stop_review_app` job to stop the environment.
 
 You can view a deployment's expiration date in the GitLab UI.
 
-1. Go to the project's **Deployments > Environments** page.
+1. On the top bar, select **Menu > Projects** and find your project.
+1. On the left sidebar, select **Deployments > Environments**.
 1. Select the name of the deployment.
 
 In the top left, next to the environment name, the expiration date is displayed.
@@ -474,7 +478,8 @@ In the top left, next to the environment name, the expiration date is displayed.
 
 You can manually override a deployment's expiration date.
 
-1. Go to the project's **Deployments > Environments** page.
+1. On the top bar, select **Menu > Projects** and find your project.
+1. On the left sidebar, select **Deployments > Environments**.
 1. Select the deployment name.
 1. On the top right, select the thumbtack (**{thumbtack}**).
 
@@ -491,7 +496,8 @@ You can delete [stopped environments](#stopping-an-environment) in the GitLab UI
 
 To delete a stopped environment in the GitLab UI:
 
-1. Go to the project's **Deployments > Environments** page.
+1. On the top bar, select **Menu > Projects** and find your project.
+1. On the left sidebar, select **Deployments > Environments**.
 1. Select the **Stopped** tab.
 1. Next to the environment you want to delete, select **Delete environment**.
 1. On the confirmation dialog box, select **Delete environment**.
@@ -596,7 +602,9 @@ Limitations of GitLab Auto Rollback:
 
 GitLab Auto Rollback is turned off by default. To turn it on:
 
-1. Go to **Project > Settings > CI/CD > Automatic deployment rollbacks**.
+1. On the top bar, select **Menu > Projects** and find your project.
+1. On the left sidebar, select **Settings > CI/CD**.
+1. Expand **Automatic deployment rollbacks**.
 1. Select the checkbox for **Enable automatic rollbacks**.
 1. Select **Save changes**.
 
diff --git a/doc/ci/environments/protected_environments.md b/doc/ci/environments/protected_environments.md
index 0c29f0aa7a7..4d89bba9ec1 100644
--- a/doc/ci/environments/protected_environments.md
+++ b/doc/ci/environments/protected_environments.md
@@ -30,18 +30,19 @@ To protect, update, or unprotect an environment, you need to have at least the
 
 To protect an environment:
 
-1. Navigate to your project's **Settings > CI/CD**.
-1. Expand the **Protected environments** section.
-1. From the **Environment** dropdown menu, select the environment you want to protect.
-1. In the **Allowed to Deploy** dropdown menu, select the role, users, or groups you
+1. On the top bar, select **Menu > Projects** and find your project.
+1. On the left sidebar, select **Settings > CI/CD**.
+1. Expand **Protected environments**.
+1. From the **Environment** list, select the environment you want to protect.
+1. In the **Allowed to deploy** list, select the role, users, or groups you
    want to give deploy access to. Keep in mind that:
    - There are two roles to choose from:
-     - **Maintainers**: Allows access to all maintainers in the project.
-     - **Developers**: Allows access to all maintainers and all developers in the project.
-   - You can only select groups that are already associated with the project.
-   - Only users that have at least the Developer role appear in
-     the **Allowed to Deploy** dropdown menu.
-1. Click the **Protect** button.
+     - **Maintainers**: Allows access to all of the project's users with the Maintainer role.
+     - **Developers**: Allows access to all of the project's users with the Maintainer and Developer role.
+   - You can select groups that are already associated with the project only.
+   - Users must have at least the Developer role to appear in
+     the **Allowed to deploy** list.
+1. Select **Protect**.
 
 The protected environment now appears in the list of protected environments.
 
@@ -134,10 +135,10 @@ appears in the dropdown menu for deployment-only access.
 
 To add deployment-only access:
 
-1. Add a group with Reporter permissions.
-1. Add user(s) to the group.
+1. Add a group with the Reporter role.
+1. Add users to the group.
 1. Invite the group to be a project member.
-1. Follow the steps outlined in [Protecting Environments](#protecting-environments).
+1. Follow the steps in [Protecting Environments](#protecting-environments).
 
 Note that deployment-only access is the only possible access level for groups with [Reporter permissions](../../user/permissions.md).