Commit e4cba057 authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'pl-docs-code-review-merged-results-forks' into 'master'

Mention Merged Results for forked projects in code review docs

See merge request gitlab-org/gitlab!40309
parents 3a4a46bd 55847026
...@@ -361,9 +361,10 @@ When ready to merge: ...@@ -361,9 +361,10 @@ When ready to merge:
- If the **latest [Pipeline for Merged Results](../ci/merge_request_pipelines/pipelines_for_merged_results/#pipelines-for-merged-results-premium)** finished less than 2 hours ago, you - If the **latest [Pipeline for Merged Results](../ci/merge_request_pipelines/pipelines_for_merged_results/#pipelines-for-merged-results-premium)** finished less than 2 hours ago, you
might merge without starting a new pipeline as the merge request is close might merge without starting a new pipeline as the merge request is close
enough to `master`. enough to `master`.
- If the **merge request is from a fork**, we can't use [Pipelines for Merged Results](../ci/merge_request_pipelines/pipelines_for_merged_results/index.md#prerequisites), therefore, they're more prone to breaking `master`. - If the **merge request is from a fork**, we can use [Pipelines for Merged Results from a forked project](../ci/merge_request_pipelines/index.md#run-pipelines-in-the-parent-project-for-merge-requests-from-a-forked-project-starter) with caution.
Check how far behind `master` the source branch is. If it's more than 100 commits behind, ask the author to Before triggering the pipeline, review all changes for **malicious code**.
rebase it before merging. If you cannot trigger the pipeline, review the status of the fork relative to `master`.
If it's more than 100 commits behind, ask the author to rebase it before merging.
- If [master is broken](https://about.gitlab.com/handbook/engineering/workflow/#broken-master), - If [master is broken](https://about.gitlab.com/handbook/engineering/workflow/#broken-master),
in addition to the two above rules, check that any failure also happens in addition to the two above rules, check that any failure also happens
in `master` and post a link to the ~"master:broken" issue before clicking the in `master` and post a link to the ~"master:broken" issue before clicking the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment