Add latest changes from gitlab-org/gitlab@master

5 files changed, 38 insertions, 15 deletions

diff --git a/doc/install/README.md b/doc/install/README.md
index 6b497763d93..06066bc0c7d 100644
--- a/doc/install/README.md
+++ b/doc/install/README.md
@@ -28,9 +28,7 @@ with Kubernetes.
 
 ## Requirements
 
-Before installing GitLab, make sure to check the [requirements documentation](requirements.md)
-which includes useful information on the supported Operating Systems as well as
-the hardware requirements.
+Before installing GitLab, it is of critical importance to review the system [requirements](requirements.md). The system requirements include details on the minimum hardware, software, database, and additional requirements to support GitLab.
 
 ## Installing GitLab using the Omnibus GitLab package (recommended)
 
diff --git a/doc/integration/sourcegraph.md b/doc/integration/sourcegraph.md
index da384fa9528..c0ce3c30ca6 100644
--- a/doc/integration/sourcegraph.md
+++ b/doc/integration/sourcegraph.md
@@ -4,7 +4,8 @@ type: reference, how-to
 
 # Sourcegraph integration
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16556) in GitLab 12.5. Please note that this integration is in BETA and [behind a feature flag](#enable-the-sourcegraph-feature-flag).
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16556) in GitLab 12.5.
+> - Note that this integration is in BETA and deployed [behind a feature flag](#enable-the-sourcegraph-feature-flag) disabled by default. Self-managed instances can opt to enable it.
 
 [Sourcegraph](https://sourcegraph.com) provides code intelligence features, natively integrated into the GitLab UI.
 
@@ -106,18 +107,17 @@ When visiting one of these views, you can now hover over a code reference to see
 
 ## Sourcegraph for GitLab.com
 
-Sourcegraph powered code intelligence will be incrementally rolled out on GitLab.com.
-It will eventually become available for all public projects, but for now, it is only
-available for some specific projects within the [`gitlab-org`](https://gitlab.com/gitlab-org/)
-group, e.g., <https://gitlab.com/gitlab-org/gitlab>. This means that you can see
-it working and use it to dig into the code of these projects, but you cannot use
-it on your own project on GitLab.com yet.
+Sourcegraph powered code intelligence is avaialable for all public projects on GitLab.com.
 
-If you would like to use it in your own projects as of GitLab 12.5, you can do so by
-setting up a self-managed GitLab instance.
+Support for private projects is currently not available for GitLab.com;
+follow the epic [&2201](https://gitlab.com/groups/gitlab-org/-/epics/2201)
+for updates.
 
-Follow the epic [&2201](https://gitlab.com/groups/gitlab-org/-/epics/2201) for
-updates.
+## Troubleshooting
+
+### Sourcegraph isn't working
+
+If you enabled Sourcegraph for your project but still it doesn't looklike it's working, it might be because Sourcegraph has not indexed theproject yet. You can check for Sourcegraph's availability of your project by visiting `https://sourcegraph.com/gitlab.com/<project-path>`replacing `<project-path>` with the path to your GitLab project.
 
 ## Sourcegraph and Privacy
 
diff --git a/doc/policy/maintenance.md b/doc/policy/maintenance.md
index e9311285ba5..4c27bc5c4fd 100644
--- a/doc/policy/maintenance.md
+++ b/doc/policy/maintenance.md
@@ -168,6 +168,9 @@ Please see the table below for some examples:
 | 12.5.8                | 11.3.4       | `11.3.4` -> `11.11.8` -> `12.0.12` -> `12.5.8`            | `11.11.8` is the last version in version `11`. `12.0.x` [is a required step](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23211#note_272842444). |
 | 12.8.5                | 9.2.6       | `9.2.6` -> `9.5.10` -> `10.8.7` -> `11.11.8` -> `12.0.12` -> `12.8.5` | Four intermediate versions are required: the final 9.5, 10.8, 11.11 releases, plus 12.0. |
 
+NOTE: **Note:**
+Instructions for installing a specific version of GitLab or downloading the package locally for installation can be found at [GitLab Repositories](https://packages.gitlab.com/gitlab).
+
 ## More information
 
 More information about the release procedures can be found in our
diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md
index a99444c013f..92466dab033 100644
--- a/doc/user/gitlab_com/index.md
+++ b/doc/user/gitlab_com/index.md
@@ -96,7 +96,9 @@ GitLab.com is using the IP range `34.74.90.64/28` for traffic from its Web/API
 fleet. You can expect connections from webhooks or repository mirroring to come
 from those IPs and whitelist them.
 
-For connections from CI/CD runners we are not providing static IP addresses.
+GitLab.com is fronted by Cloudflare. For incoming connections to GitLab.com you might need to whitelist CIDR blocks of Cloudflare ([IPv4](https://www.cloudflare.com/ips-v4) and [IPv6](https://www.cloudflare.com/ips-v6))
+
+For outgoing connections from CI/CD runners we are not providing static IP addresses.
 All our runners are deployed into Google Cloud Platform (GCP) - any IP based
 firewall can be configured by looking up all
 [IP address ranges or CIDR blocks for GCP](https://cloud.google.com/compute/docs/faq#where_can_i_find_product_name_short_ip_ranges).
diff --git a/doc/user/project/merge_requests/creating_merge_requests.md b/doc/user/project/merge_requests/creating_merge_requests.md
index 268789e092e..e8c691a3d7f 100644
--- a/doc/user/project/merge_requests/creating_merge_requests.md
+++ b/doc/user/project/merge_requests/creating_merge_requests.md
@@ -155,6 +155,26 @@ and the target project and branch where you want to merge the changes into.
 Click on **Compare branches and continue** to go to the
 [**New Merge Request** page](#new-merge-request-page) and fill in the details.
 
+## New merge request from a fork
+
+After forking a project and applying your local changes, complete the following steps to
+create a merge request from your fork to contribute back to the main project:
+
+1. Go to **Projects > Your Projects** and select your fork of the repository.
+1. In the left menu, go to **Merge Requests**, and click **New Merge Request**.
+1. In the **Source branch** drop-down list box, select your branch in your forked repository as the source branch.
+1. In the **Target branch** drop-down list box, select the branch from the upstream repository as the target branch.
+1. After entering the credentials, click **Compare branches and continue** to compare your local changes to the upstream repository.
+1. Assign a user to review your changes, and click **Submit merge request**.
+
+When the changes are merged, your changes are added to the upstream repository and
+the branch as per specification. After your work is merged, if you don't intend to
+make any other contributions to the upstream project, you can unlink your
+fork from its upstream project in the **Settings > Advanced Settings** section by
+[removing the forking relashionship](../settings/index.md#removing-a-fork-relationship).
+
+For further details, [see the forking workflow documentation](../repository/forking_workflow.md).
+
 ## New merge request by email **(CORE ONLY)**
 
 _This feature needs [incoming email](../../../administration/incoming_email.md)