Add latest changes from gitlab-org/gitlab@master

12 files changed, 31 insertions, 14 deletions

diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md
index e8b6c9af879..8e018b7a6fe 100644
--- a/doc/administration/high_availability/nfs.md
+++ b/doc/administration/high_availability/nfs.md
@@ -54,6 +54,8 @@ management between systems:
 
 ### Improving NFS performance with GitLab
 
+#### Improving NFS performance with Unicorn
+
 NOTE: **Note:** From GitLab 12.1, it will automatically be detected if Rugged can and should be used per storage.
 
 If you previously enabled Rugged using the feature flag, you will need to unset the feature flag by using:
@@ -64,6 +66,16 @@ sudo gitlab-rake gitlab:features:unset_rugged
 
 If the Rugged feature flag is explicitly set to either true or false, GitLab will use the value explicitly set.
 
+#### Improving NFS performance with Puma
+
+NOTE: **Note:** From GitLab 12.7, Rugged auto-detection is disabled if Puma thread count is greater than 1.
+
+If you want to use Rugged with Puma, it is recommended to [set Puma thread count to 1](https://docs.gitlab.com/omnibus/settings/puma.html#puma-settings).
+
+If you want to use Rugged with Puma thread count more than 1, Rugged can be enabled using the [feature flag](../../development/gitaly.md#legacy-rugged-code)
+
+If the Rugged feature flag is explicitly set to either true or false, GitLab will use the value explicitly set.
+
 ### Known issues
 
 On some customer systems, we have seen NFS clients slow precipitously due to
diff --git a/doc/ci/review_apps/index.md b/doc/ci/review_apps/index.md
index e19167f6d9a..860eab469dd 100644
--- a/doc/ci/review_apps/index.md
+++ b/doc/ci/review_apps/index.md
@@ -188,6 +188,9 @@ With Visual Reviews, you can provide a feedback form to your Review Apps so
 that reviewers can post comments directly from the app back to the merge request
 that spawned the Review App.
 
+NOTE: **Note:** Visual Reviews currently only work for public projects. Support for private
+and internal projects [is planned](https://gitlab.com/gitlab-org/gitlab/-/issues/42750).
+
 ### Configuring Visual Reviews
 
 Ensure that the `anonymous_visual_review_feedback` feature flag is enabled.
diff --git a/doc/development/README.md b/doc/development/README.md
index b207f208e3d..75dc54050d8 100644
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -181,11 +181,11 @@ Complementary reads:
 - [Externalization](i18n/externalization.md)
 - [Translation](i18n/translation.md)
 
-## Event tracking guides
+## Telemetry guides
 
-- [Introduction](event_tracking/index.md)
-- [Frontend tracking guide](event_tracking/frontend.md)
-- [Backend tracking guide](event_tracking/backend.md)
+- [Introduction](../telemetry/index.md)
+- [Frontend tracking guide](../telemetry/frontend.md)
+- [Backend tracking guide](../telemetry/backend.md)
 
 ## Experiment Guide
 
diff --git a/doc/development/experiment_guide/index.md b/doc/development/experiment_guide/index.md
index b7f497ecd7a..66b7bd8ed0f 100644
--- a/doc/development/experiment_guide/index.md
+++ b/doc/development/experiment_guide/index.md
@@ -55,7 +55,7 @@ The author then adds a comment to this piece of code and adds a link to the issu
   end
   ```
 
-- Track necessary events. See the [event tracking guide](../event_tracking/index.md) for details.
+- Track necessary events. See the [telemetry guide](../../telemetry/index.md) for details.
 - After the merge request is merged, use [`chatops`](../../ci/chatops/README.md) to enable the feature flag and start the experiment. For visibility, please run the command in the `#s_growth` channel:
 
   ```
diff --git a/doc/development/fe_guide/event_tracking.md b/doc/development/fe_guide/event_tracking.md
index 13f107eebb1..ae555e99c6b 100644
--- a/doc/development/fe_guide/event_tracking.md
+++ b/doc/development/fe_guide/event_tracking.md
@@ -1,5 +1,5 @@
 ---
-redirect_to: '../event_tracking/index.md'
+redirect_to: '../../telemetry/index.md'
 ---
 
-This document was moved to [another location](../event_tracking/frontend.md).
+This document was moved to [another location](../../telemetry/index.md).
diff --git a/doc/development/instrumentation.md b/doc/development/instrumentation.md
index 290a3eac758..55b42bb6ef9 100644
--- a/doc/development/instrumentation.md
+++ b/doc/development/instrumentation.md
@@ -5,7 +5,7 @@ blocks of Ruby code. Method instrumentation is the primary form of
 instrumentation with block-based instrumentation only being used when we want to
 drill down to specific regions of code within a method.
 
-Please refer to [Event tracking](event_tracking/index.md) if you are tracking product usage patterns.
+Please refer to [Telemetry](../telemetry/index.md) if you are tracking product usage patterns.
 
 ## Instrumenting Methods
 
diff --git a/doc/development/event_tracking/backend.md b/doc/telemetry/backend.md
index c571439af8a..c571439af8a 100644
--- a/doc/development/event_tracking/backend.md
+++ b/doc/telemetry/backend.md
diff --git a/doc/development/event_tracking/frontend.md b/doc/telemetry/frontend.md
index fcd394500ec..fcd394500ec 100644
--- a/doc/development/event_tracking/frontend.md
+++ b/doc/telemetry/frontend.md
diff --git a/doc/development/event_tracking/index.md b/doc/telemetry/index.md
index 8c00930a781..55a7fad86be 100644
--- a/doc/development/event_tracking/index.md
+++ b/doc/telemetry/index.md
@@ -44,7 +44,7 @@ From the backend, the events that are tracked will likely consist of things like
 
 See [Backend tracking guide](backend.md).
 
-Also, see [Instrumenting Ruby code](../instrumentation.md) if you are instrumenting application performance metrics for Ruby code.
+Also, see [Instrumenting Ruby code](../development/instrumentation.md) if you are instrumenting application performance metrics for Ruby code.
 
 ## Enabling tracking
 
diff --git a/doc/user/group/epics/index.md b/doc/user/group/epics/index.md
index 861054c2a0a..7712b86bbe2 100644
--- a/doc/user/group/epics/index.md
+++ b/doc/user/group/epics/index.md
@@ -5,7 +5,7 @@ type: reference, howto
 # Epics **(PREMIUM)**
 
 > - Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.2.
-> - In [GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/issues/37081), single-level Epics were moved to Premium tier.
+> - In [GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/issues/37081), single-level Epics were moved to the Premium tier.
 
 Epics let you manage your portfolio of projects more efficiently and with less
 effort by tracking groups of issues that share a theme, across projects and
diff --git a/doc/user/group/roadmap/index.md b/doc/user/group/roadmap/index.md
index 6eca9e84ce9..124aa217272 100644
--- a/doc/user/group/roadmap/index.md
+++ b/doc/user/group/roadmap/index.md
@@ -2,9 +2,10 @@
 type: reference
 ---
 
-# Roadmap **(ULTIMATE)**
+# Roadmap **(PREMIUM)**
 
-> Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.5.
+> - Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.5.
+> - In [GitLab 12.9](https://gitlab.com/gitlab-org/gitlab/issues/198062), Roadmaps were moved to the Premium tier.
 
 An Epic within a group containing **Start date** and/or **Due date**
 can be visualized in a form of a timeline (e.g. a Gantt chart). The Epics Roadmap page
@@ -35,7 +36,8 @@ Roadmaps can also be [visualized inside an epic](../epics/index.md#roadmap-in-ep
 
 ## Timeline duration
 
-> Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.0.
+> - Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.0.
+> - In [GitLab 12.9](https://gitlab.com/gitlab-org/gitlab/issues/198062), Timelines were moved to the Premium tier.
 
 Roadmap supports the following date ranges:
 
diff --git a/doc/user/profile/notifications.md b/doc/user/profile/notifications.md
index 2a624283e05..3f843bf8b5e 100644
--- a/doc/user/profile/notifications.md
+++ b/doc/user/profile/notifications.md
@@ -181,7 +181,7 @@ To minimize the number of notifications that do not require any action, from [Gi
 | Remove milestone merge request | Subscribers, participants mentioned, and Custom notification level with this event selected |
 | New comment            | The above, plus anyone mentioned by `@username` in the comment, with notification level "Mention" or higher |
 | Failed pipeline        | The author of the pipeline |
-| Fixed pipeline    | The author of the pipeline |
+| Fixed pipeline    | The author of the pipeline. Disabled by default. To activate it you must [enable the `ci_pipeline_fixed_notifications` feature flag](../../development/feature_flags/development.md#enabling-a-feature-flag-in-development). |
 | Successful pipeline    | The author of the pipeline, if they have the custom notification setting for successful pipelines set. If the pipeline failed previously, a `Fixed pipeline` message will be sent for the first successful pipeline after the failure, then a `Successful pipeline` message for any further successful pipelines. |
 | New epic **(ULTIMATE)** |        |
 | Close epic **(ULTIMATE)** |      |