Add latest changes from gitlab-org/gitlab@master

5 files changed, 19 insertions, 26 deletions

diff --git a/doc/development/cycle_analytics.md b/doc/development/cycle_analytics.md
index 284645cdae7..90abafb3e03 100644
--- a/doc/development/cycle_analytics.md
+++ b/doc/development/cycle_analytics.md
@@ -77,8 +77,8 @@ end
 
 Some start/end event pairs are not "compatible" with each other. For example:
 
-- "Issue created" to "Merge Request created": The event classes are defined on different  domain models, the `object_type` method is different.
-- "Issue closed" to "Issue created": Issue must be created first before it can be  closed.
+- "Issue created" to "Merge Request created": The event classes are defined on different domain models, the `object_type` method is different.
+- "Issue closed" to "Issue created": Issue must be created first before it can be closed.
 - "Issue closed" to "Issue closed": Duration is always 0.
 
 The `StageEvents` module describes the allowed `start_event` and `end_event` pairings (`PAIRING_RULES` constant). If a new event is added, it needs to be registered in this module.
diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md
index d516a808afd..32c89c28815 100644
--- a/doc/development/pipelines.md
+++ b/doc/development/pipelines.md
@@ -156,7 +156,7 @@ This is similar to the `.only:variables-canonical-dot-com` + `.except:refs-maste
 CI definitions:
 
 ```yaml
-.if-canonical-gitlab-and-merge-request: &if-canonical-gitlab-and-merge-request
+.if-canonical-gitlab-merge-request: &if-canonical-gitlab-merge-request
   if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_MERGE_REQUEST_IID'
 ```
 
@@ -210,9 +210,7 @@ graph RL;
   M[coverage];
   N[pages];
   O[static-analysis];
-  P["schedule:package-and-qa<br/>(master schedule only)"];
   Q[package-and-qa];
-  R[package-and-qa-manual];
   S["RSpec<br/>(e.g. rspec unit pg9)"]
   T[retrieve-tests-metadata];
 
@@ -259,10 +257,6 @@ subgraph "`review` stage"
 subgraph "`qa` stage"
     Q --> |needs| C;
     Q --> |needs| F;
-    R --> |needs| C;
-    R --> |needs| F;
-    P --> |needs| C;
-    P --> |needs| F;
     review-qa-smoke -.-> |needs and depends on| G;
     review-qa-all -.-> |needs and depends on| G;
     review-performance -.-> |needs and depends on| G;
@@ -271,8 +265,7 @@ subgraph "`qa` stage"
     end
 
 subgraph "`notification` stage"
-    NOTIFICATION1["schedule:package-and-qa:notify-success<br>(on_success)"] -.-> |needs| P;
-    NOTIFICATION2["schedule:package-and-qa:notify-failure<br>(on_failure)"] -.-> |needs| P;
+    NOTIFICATION2["package-and-qa:notify-failure<br>(manual)"] -.-> |needs| Q;
     end
 
 subgraph "`post-test` stage"
diff --git a/doc/development/testing_guide/end_to_end/index.md b/doc/development/testing_guide/end_to_end/index.md
index 20b594119ab..85cad3971c3 100644
--- a/doc/development/testing_guide/end_to_end/index.md
+++ b/doc/development/testing_guide/end_to_end/index.md
@@ -27,11 +27,11 @@ You can find these nightly pipelines at `https://gitlab.com/gitlab-org/quality/s
 
 ### Testing code in merge requests
 
-#### Using the `package-and-qa-manual` job
+#### Using the `package-and-qa` job
 
 It is possible to run end-to-end tests for a merge request, eventually being run in
 a pipeline in the [`gitlab-qa`](https://gitlab.com/gitlab-org/gitlab-qa/) project,
-by triggering the `package-and-qa-manual` manual action in the `test` stage (not
+by triggering the `package-and-qa` manual action in the `test` stage (not
 available for forks).
 
 **This runs end-to-end tests against a custom Omnibus package built from your
@@ -53,7 +53,7 @@ graph LR
     B2[`Trigger-qa` stage<br>`Trigger:qa-test` job] -.->|2. Triggers a gitlab-qa pipeline and wait for it to be done| A3
 
 subgraph "gitlab-foss/gitlab pipeline"
-    A1[`test` stage<br>`package-and-qa-manual` job]
+    A1[`test` stage<br>`package-and-qa` job]
     end
 
 subgraph "omnibus-gitlab pipeline"
@@ -61,7 +61,7 @@ subgraph "omnibus-gitlab pipeline"
     end
 
 subgraph "gitlab-qa pipeline"
-    A3>QA jobs run] -.->|3. Reports back the pipeline result to the `package-and-qa-manual` job<br>and post the result  on the original commit tested| A1
+    A3>QA jobs run] -.->|3. Reports back the pipeline result to the `package-and-qa` job<br>and post the result  on the original commit tested| A1
     end
 ```
 
diff --git a/doc/development/testing_guide/end_to_end/page_objects.md b/doc/development/testing_guide/end_to_end/page_objects.md
index 554995fa2e2..f1e0de0c792 100644
--- a/doc/development/testing_guide/end_to_end/page_objects.md
+++ b/doc/development/testing_guide/end_to_end/page_objects.md
@@ -40,7 +40,7 @@ the time it would take to build packages and test everything.
 That is why when someone changes `t.text_field :login` to
 `t.text_field :username` in the _new session_ view we won't know about this
 change until our GitLab QA nightly pipeline fails, or until someone triggers
-`package-and-qa-manual` action in their merge request.
+`package-and-qa` action in their merge request.
 
 Obviously such a change would break all tests. We call this problem a _fragile
 tests problem_.
@@ -171,8 +171,8 @@ and we should prefer the `data-qa-selector` method of definition.
 
 > Introduced in GitLab 12.5
 
-A common occurrence in automated testing is selecting a single "one-of-many" element.  
-In a list of several items, how do you differentiate what you are selecting on?  
+A common occurrence in automated testing is selecting a single "one-of-many" element.
+In a list of several items, how do you differentiate what you are selecting on?
 The most common workaround for this is via text matching.  Instead, a better practice is
 by matching on that specific element by a unique identifier, rather than by text.
 
diff --git a/doc/user/analytics/cycle_analytics.md b/doc/user/analytics/cycle_analytics.md
index 796cae70803..dfc0f488ff9 100644
--- a/doc/user/analytics/cycle_analytics.md
+++ b/doc/user/analytics/cycle_analytics.md
@@ -44,8 +44,8 @@ There are seven stages that are tracked as part of the Cycle Analytics calculati
   - Time spent on code review
 - **Staging** (Continuous Deployment)
   - Time between merging and deploying to production
-- **Production** (Total)
-  - Total lifecycle time; i.e. the velocity of the project or team
+- **Total** (Total)
+  - Total lifecycle time. That is, the velocity of the project or team. [Previously known](https://gitlab.com/gitlab-org/gitlab/issues/38317) as **Production**.
 
 ## Date ranges
 
@@ -60,12 +60,12 @@ GitLab provides the ability to filter analytics based on a date range. To filter
 ## How the data is measured
 
 Cycle Analytics records cycle time and data based on the project issues with the
-exception of the staging and production stages, where only data deployed to
+exception of the staging and total stages, where only data deployed to
 production are measured.
 
 Specifically, if your CI is not set up and you have not defined a `production`
 or `production/*` [environment](../../ci/yaml/README.md#environment), then you will not have any
-data for those stages.
+data for this stage.
 
 Each stage of Cycle Analytics is further described in the table below.
 
@@ -77,7 +77,7 @@ Each stage of Cycle Analytics is further described in the table below.
 | Test      | Measures the median time to run the entire pipeline for that project. It's related to the time GitLab CI takes to run every job for the commits pushed to that merge request defined in the previous stage. It is basically the start->finish time for all pipelines. |
 | Review    | Measures the median time taken to review the merge request that has closing issue pattern, between its creation and until it's merged. |
 | Staging   | Measures the median time between merging the merge request with closing issue pattern until the very first deployment to production. It's tracked by the environment set to `production` or matching `production/*` (case-sensitive, `Production` won't work) in your GitLab CI configuration. If there isn't a production environment, this is not tracked. |
-| Production| The sum of all time (medians) taken to run the entire process, from issue creation to deploying the code to production. |
+| Total | The sum of all time (medians) taken to run the entire process, from issue creation to deploying the code to production. [Previously known](https://gitlab.com/gitlab-org/gitlab/issues/38317) as **Production**. |
 
 How this works, behind the scenes:
 
@@ -124,7 +124,7 @@ environments is configured.
 1. Now that the merge request is merged, a deployment to the `production`
    environment starts and finishes at 19:30 (stop of **Staging** stage).
 1. The cycle completes and the sum of the median times of the previous stages
-   is recorded to the **Production** stage. That is the time between creating an
+   is recorded to the **Total** stage. That is the time between creating an
    issue and deploying its relevant merge request to production.
 
 From the above example you can conclude the time it took each stage to complete
@@ -136,10 +136,10 @@ as long as their total time:
 - **Test**:   5min
 - **Review**: 5h (19:00 - 14:00)
 - **Staging**:  30min (19:30 - 19:00)
-- **Production**: Since this stage measures the sum of median time off all
+- **Total**: Since this stage measures the sum of median time of all
   previous stages, we cannot calculate it if we don't know the status of the
   stages before. In case this is the very first cycle that is run in the project,
-  then the **Production** time is 10h 30min (19:30 - 09:00)
+  then the **Total** time is 10h 30min (19:30 - 09:00)
 
 A few notes: