Add latest changes from gitlab-org/gitlab@master

3 files changed, 14 insertions, 4 deletions

diff --git a/doc/ci/pipelines/pipeline_architectures.md b/doc/ci/pipelines/pipeline_architectures.md
index 803d0130cf0..4872e2595f9 100644
--- a/doc/ci/pipelines/pipeline_architectures.md
+++ b/doc/ci/pipelines/pipeline_architectures.md
@@ -11,7 +11,7 @@ There are three main ways to structure your pipelines, each with their
 own advantages. These methods can be mixed and matched if needed:
 
 - [Basic](#basic-pipelines): Good for straightforward projects where all the configuration is in one easy to find place.
-- [Directed Acylic Graph](#directed-acyclic-graph-pipelines): Good for large, complex projects that need efficient execution.
+- [Directed Acyclic Graph](#directed-acyclic-graph-pipelines): Good for large, complex projects that need efficient execution.
 - [Child/Parent Pipelines](#child--parent-pipelines): Good for monorepos and projects with lots of independently defined components.
 
 For more details about
@@ -92,7 +92,7 @@ deploy_b:
 ## Directed Acyclic Graph Pipelines
 
 If efficiency is important to you and you want everything to run as quickly as possible,
-you can use [Directed Acylic Graphs (DAG)](../directed_acyclic_graph/index.md). Use the
+you can use [Directed Acyclic Graphs (DAG)](../directed_acyclic_graph/index.md). Use the
 [`needs` keyword](../yaml/README.md#needs) to define dependency relationships between
 your jobs. When GitLab knows the relationships between your jobs, it can run everything
 as fast as possible, and even skips into subsequent stages when possible.
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 558ae5e20d3..707b14cda95 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -3588,8 +3588,8 @@ Floats are not legal and cannot be used.
 
 GitLab CI/CD allows you to define variables inside `.gitlab-ci.yml` that are
 then passed in the job environment. They can be set globally and per-job.
-When the `variables` keyword is used on a job level, it overrides the global
-YAML variables and predefined ones.
+When the `variables` keyword is used on a job level, it will override the global
+YAML variables and predefined ones of the same name.
 
 They are stored in the Git repository and are meant to store non-sensitive
 project configuration, for example:
diff --git a/doc/development/rake_tasks.md b/doc/development/rake_tasks.md
index 600afcff1b0..61d5277b1e6 100644
--- a/doc/development/rake_tasks.md
+++ b/doc/development/rake_tasks.md
@@ -65,6 +65,16 @@ bin/rake "gitlab:seed:group_seed[subgroup_depth, username]"
 
 Group are additionally seeded with epics if GitLab instance has epics feature available.
 
+#### Seeding custom metrics for the monitoring dashboard
+
+A lot of different types of metrics are supported in the monitoring dashboard.
+
+To import these metrics, you can run:
+
+```shell
+bundle exec rake 'gitlab:seed:development_metrics[your_project_id]'
+```
+
 ### Automation
 
 If you're very sure that you want to **wipe the current database** and refill