Add latest changes from gitlab-org/gitlab@master

3 files changed, 12 insertions, 3 deletions

diff --git a/doc/user/project/merge_requests/fast_forward_merge.md b/doc/user/project/merge_requests/fast_forward_merge.md
index dc13b270f17..77162aa0b83 100644
--- a/doc/user/project/merge_requests/fast_forward_merge.md
+++ b/doc/user/project/merge_requests/fast_forward_merge.md
@@ -13,8 +13,6 @@ merge commits. In such cases, the fast-forward merge is the perfect candidate.
 With fast-forward merge requests, you can retain a linear Git history and a way
 to accept merge requests without creating merge commits.
 
-## Overview
-
 When the fast-forward merge
 ([`--ff-only`](https://git-scm.com/docs/git-merge#git-merge---ff-only)) setting
 is enabled, no merge commits are created and all merges are fast-forwarded,
@@ -22,6 +20,11 @@ which means that merging is only allowed if the branch can be fast-forwarded.
 
 When a fast-forward merge is not possible, the user is given the option to rebase.
 
+NOTE:
+Projects using the fast-forward merge strategy can't filter merge requests
+[by deployment date](../../search/index.md#filtering-merge-requests-by-environment-or-deployment-date),
+because no merge commit is created.
+
 ## Enabling fast-forward merges
 
 1. On the top bar, select **Menu > Projects** and find your project.
diff --git a/doc/user/project/settings/project_access_tokens.md b/doc/user/project/settings/project_access_tokens.md
index 6778dc9bcf9..417bc30bf44 100644
--- a/doc/user/project/settings/project_access_tokens.md
+++ b/doc/user/project/settings/project_access_tokens.md
@@ -18,7 +18,9 @@ select a limited role, and provide an expiry date.
 Use a project access token to authenticate:
 
 - With the [GitLab API](../../../api/index.md#personalprojectgroup-access-tokens).
-- With Git, when using HTTP Basic Authentication. You can use any non-blank value for a password.
+- With Git, when using HTTP Basic Authentication, use:
+  - Any non-blank value as a username.
+  - The project access token as the password.
 
 Project access tokens are similar to [group access tokens](../../group/settings/group_access_tokens.md)
 and [personal access tokens](../../profile/personal_access_tokens.md).
diff --git a/doc/user/search/index.md b/doc/user/search/index.md
index dd6b361e8f2..0ae840a75c2 100644
--- a/doc/user/search/index.md
+++ b/doc/user/search/index.md
@@ -152,6 +152,10 @@ you can type (or select from the dropdown list) the following:
 - Deployed-before
 - Deployed-after
 
+NOTE:
+Projects using a [fast-forward merge method](../project/merge_requests/fast_forward_merge.md)
+do not return results, as this method does not create a merge commit.
+
 When filtering by an environment, a dropdown list presents all environments that
 you can choose from: