Automatic merge of gitlab-org/gitlab master

app/controllers/concerns/with_performance_bar.rb

@@ -20,12 +20,11 @@ module WithPerformanceBar
   end
 
   def cookie_or_default_value
-    cookie_enabled = if cookies[:perf_bar_enabled].present?
-                       cookies[:perf_bar_enabled] == 'true'
-                     else
-                       cookies[:perf_bar_enabled] = 'true' if Rails.env.development?
+    if cookies[:perf_bar_enabled].blank? && Rails.env.development?
+      cookies[:perf_bar_enabled] = 'true'
     end
 
+    cookie_enabled = cookies[:perf_bar_enabled] == 'true'
     cookie_enabled && Gitlab::PerformanceBar.allowed_for_user?(current_user)
   end
 end

doc/ci/merge_request_pipelines/index.md

@@ -225,9 +225,9 @@ which helps you get your starting configuration correct.
 If you are seeing two pipelines when using `only/except`, please see the caveats
 related to using `only/except` above (or, consider moving to `rules`).
 
-It is not possible to run a job for branch pipelines first, then only for merge request
-pipelines after the merge request is created (skipping the duplicate branch pipeline). See
-the [related issue](https://gitlab.com/gitlab-org/gitlab/-/issues/201845) for more details.
+In [GitLab 13.7](https://gitlab.com/gitlab-org/gitlab/-/issues/201845) and later,
+you can add `workflow:rules` to [switch from branch pipelines to merge request pipelines](../yaml/README.md#switch-between-branch-pipelines-and-merge-request-pipelines)
+after a merge request is open on the branch.
 
 ### Two pipelines created when pushing an invalid CI configuration file
 

doc/ci/unit_test_reports.md

@@ -307,6 +307,25 @@ test:
         - report.xml
 ```
 
+### PHP example
+
+This example uses [PHPUnit](https://phpunit.de/) with the `--log-junit` flag.
+You can also add this option using
+[XML](https://phpunit.readthedocs.io/en/stable/configuration.html#the-junit-element)
+in the `phpunit.xml` configuration file.
+
+```yaml
+phpunit:
+  stage: test
+  script:
+    - composer install
+    - vendor/bin/phpunit --log-junit report.xml
+  artifacts:
+    when: always
+    reports:
+      junit: report.xml
+```
+
 ## Viewing Unit test reports on GitLab
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/24792) in GitLab 12.5 behind a feature flag (`junit_pipeline_view`), disabled by default.

doc/ci/yaml/README.md

@@ -1251,8 +1251,11 @@ causes duplicated pipelines.
 
 To avoid duplicate pipelines, you can:
 
-- Use [`workflow`](#workflow) to specify which types of pipelines
-  can run.
+- Use the `CI_OPEN_MERGE_REQUESTS` CI/CD variable in [`workflow:rules`](#workflow) to
+  [switch between branch and merge request pipelines](#switch-between-branch-pipelines-and-merge-request-pipelines)
+  without duplication. You can also use this variable in individual job rules.
+- Use [`workflow`](#workflow) to specify that only branch pipelines or only merge request
+  pipelines should run.
 - Rewrite the rules to run the job only in very specific cases,
   and avoid a final `when:` rule: