[merge-train skip]

[ci skip]

Prepare 17.8.5 release for gitlab-jh

See merge request gitlab-cn/gitlab!3024

[merge-train skip]

[ci skip]

[ci skip]

Vendor GraphQL gem

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4840



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Luke Duncalfe <lduncalfe@gitlab.com>
Approved-by: Doug Stull <dstull@gitlab.com>
Approved-by: Justin Ho Tuan Duong <hduong@gitlab.com>
Co-authored-by: Joern Schneeweisz <jschneeweisz@gitlab.com>
Co-authored-by: Rodrigo Tomonari <rtomonari@gitlab.com>
Co-authored-by: George Koltsov <gkoltsov@gitlab.com>

Merge branch 'security-ruby-graphql-17-8' into '17-8-stable-ee'

See merge request gitlab-org/security/gitlab!4840

Changelog: security

Ruby-SAML updates

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4829



Merged-by: Maina Ng'ang'a <anganga@gitlab.com>
Approved-by: Luke Duncalfe <lduncalfe@gitlab.com>
Co-authored-by: Drew Blessing <drew@gitlab.com>

Merge branch 'security-dblessing-ruby-saml-17-8' into '17-8-stable-ee'

See merge request gitlab-org/security/gitlab!4829

Changelog: security

Merge branch 'security-prevent-custom-admin-group-member-ability-to-activate-group-members-17-8' into '17-8-stable-ee'

Prevent custom role to activate group members

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4834



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Gabriel Mazetto <gabriel@gitlab.com>
Co-authored-by: Alex Buijs <abuijs@gitlab.com>

Merge branch 'security-prevent-custom-admin-group-member-ability-to-activate-group-members-17-8' into '17-8-stable-ee'

See merge request gitlab-org/security/gitlab!4834

Changelog: security

approval_rules name is unbounded

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4837



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Hunter Stewart <hustewart@gitlab.com>
Approved-by: Joy Roodnick <jroodnick@gitlab.com>
Co-authored-by: Javiera Tapia <jtapia@gitlab.com>

Merge branch 'security-519348-approval-rules-name-bounded-17-8' into '17-8-stable-ee'

See merge request gitlab-org/security/gitlab!4837

Changelog: security

Limit preview size

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4822



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Co-authored-by: hustewart <hustewart@gitlab.com>

Merge branch 'security-check-preview-size-17-8' into '17-8-stable-ee'

See merge request gitlab-org/security/gitlab!4822

Changelog: security

Maintainer can inject shell code in Google integration configurations that will trigger on victims machine when setting up integrations

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4825



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Drew Blessing <drew@gitlab.com>
Co-authored-by: agius <andrew@atevans.com>

Maintainer can inject shell code in Google integration configurations that will trigger on victims machine when setting up integrations

Merge branch 'security-482813-add-validations-google-wlif-integration-17-8' into '17-8-stable-ee'

See merge request gitlab-org/security/gitlab!4825

Changelog: security

Filter out internal notes if the recipient do not have access

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4814



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Niko Belokolodov <nbelokolodov@gitlab.com>
Co-authored-by: David Kim <dkim@gitlab.com>

Merge branch 'security-fix-1263-17-8' into '17-8-stable-ee'

See merge request gitlab-org/security/gitlab!4814

Changelog: security

Mask unencoded userinfo in project mirror errors

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4777



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Roy Zwambag <rzwambag@gitlab.com>
Co-authored-by: Joe Woodward <j@joewoodward.me>

Merge branch 'security-508557-mirror-leak-auth-17-8' into '17-8-stable-ee'

See merge request gitlab-org/security/gitlab!4777

Changelog: security

[merge-train skip]

[ci skip]

Prepare 17.8.4 release for gitlab-jh

See merge request gitlab-cn/gitlab!3014

Fixes typo on profiles controller spec

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182441



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>

[merge-train skip]

[ci skip]

[ci skip]

Increase minimum role in SPP to read policy yaml

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4716



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Max Woolf <mwoolf@gitlab.com>
Co-authored-by: mc_rocha <mrocha@gitlab.com>

Merge branch 'security-mc_rocha-fix-1230-17-8-17-8' into '17-8-stable-ee'

See merge request gitlab-org/security/gitlab!4716

Changelog: security