Cherry pick security patches from 9.1.3 into `master` & `9-2-stable`

The fixes from #31341 should go into the current branches.

master

CE & EE !11230 (merged)

• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2097 (2086)
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2098 (2088)
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2084
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2087
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2089
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2093
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2094
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2095
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2085 - Merged by @jschatz1 in https://gitlab.com/gitlab-org/gitlab-ce/commit/3aeae2c7fa22630edc8f1f29bbbdf0f7bb40e15e
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2096

EE only https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1864

• https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/508
• https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/509

9-2-stable https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11234

• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2097 (2086)
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2098 (2088)
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2084
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2087
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2089
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2093
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2094
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2095
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2085
• https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2096

EE only

• https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/508
• https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/509

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2087 - Merged by @jschatz1 in https://gitlab.com/gitlab-org/gitlab-ce/commit/3aeae2c7fa22630edc8f1f29bbbdf0f7bb40e15e as incomplete

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2085 as completed

This is currently blocking RC1. @godfat would you be able to help with the 9-2-stable picks?

mentioned in issue #31934 (closed)

mentioned in merge request !11230 (merged)

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2087 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2089 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2093 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2093 as incomplete

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2089 as incomplete

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2089 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2093 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2094 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2095 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2096 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/508 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/509 as completed

mentioned in merge request !11234 (merged)

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2097 (2086) as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2098 (2088) as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2084 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2087 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2089 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2093 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2094 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2095 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2085 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2096 as completed

Master MRs should be ready to merge when specs pass: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1864 & https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11230

MR for CE 9-2-stable should also be ready: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11234

9-2-stable-ee is not green yet, so that will require some more work. cc @selfup

Update: @oswaldo Is working on fixing 9-2-stable-ee specs

marked the checklist item https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/508 as completed

marked the checklist item https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/509 as completed

Everything as been picked into master & stable. So I'll close this.

closed