[merge-train skip]

[ci skip]

[ci skip]

Disallow serving Pages over disabled custom domains with deployments

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Vladimir Shushlin <vshushlin@gitlab.com>
Co-authored-by: Piotr Skorupa <pskorupa@gitlab.com>

Merge branch 'security-psk-fix-gitlab-pages-subdomain-takeover-17-1' into '17-1-stable-ee'

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

Changelog: security

Check npm package name, version and scripts coherence

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: David Fernandez <dfernandez@gitlab.com>
Co-authored-by: moaz-khalifa <mkhalifa@gitlab.com>

Merge branch 'security-avoid-npm-registry-manifest-confusion-17-1' into '17-1-stable-ee'

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

Changelog: security

Check for create_deploy_token policy before creating deploy token

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Kamil Trzciński <ayufan@ayufan.eu>
Co-authored-by: Hinam Mehra <hmehra@gitlab.com>

Merge branch 'security-464312-fix-create-deploy-token-policies-17-1' into '17-1-stable-ee'

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

Changelog: security

Check if user has ban_group_member access before banning in namespace

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Madelein van Niekerk <mvanniekerk@gitlab.com>
Co-authored-by: Hinam Mehra <hmehra@gitlab.com>

Merge branch 'security-451921-add-owner-check-when-banning-16-10' into '17-1-stable-ee'

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

Changelog: security

Prevent privilege escalation via custom role

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Brett Walker <bwalker@gitlab.com>
Co-authored-by: mo khan <mo@mokhan.ca>

Merge branch 'security-1123-17-1-backport' into '17-1-stable-ee'

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

Changelog: security

Prevent using quick actions for some bot users

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



Merged-by: Maina Ng'ang'a <anganga@gitlab.com>
Approved-by: Sincheol (David) Kim <dkim@gitlab.com>
Co-authored-by: Dylan Griffith <dyl.griffith@gmail.com>

Merge branch 'security-security/47-disable-quick-actions-for-some-bots-17-1' into '17-1-stable-ee'

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

Changelog: security

Disable raw HTML for quick action pipeline

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



Merged-by: Maina Ng'ang'a <anganga@gitlab.com>
Approved-by: Dylan Griffith <dyl.griffith@gmail.com>
Co-authored-by: Brett Walker <bwalker@gitlab.com>

Merge branch 'security-disable-raw-html-quick-action-17-1' into '17-1-stable-ee'

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

Changelog: security

Disable quick actions unless description changed

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



Merged-by: Maina Ng'ang'a <anganga@gitlab.com>
Approved-by: Dylan Griffith <dyl.griffith@gmail.com>
Co-authored-by: Brett Walker <bwalker@gitlab.com>

Merge branch 'security-disable-quick-actions-17-1' into '17-1-stable-ee'

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

Changelog: security

Remove comment support from shrug and tableflip

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



Merged-by: Maina Ng'ang'a <anganga@gitlab.com>
Approved-by: Dylan Griffith <dyl.griffith@gmail.com>
Co-authored-by: Brett Walker <bwalker@gitlab.com>

Merge branch 'security-tableflip-shrug-17-1' into '17-1-stable-ee'

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

Changelog: security

Update dependency slack-messenger to v2.3.5

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



Merged-by: Maina Ng'ang'a <anganga@gitlab.com>
Approved-by: James Nutt <jnutt@gitlab.com>
Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>

Backport Release Environments notification pipeline change to 17.1

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Dat Tang <dattang@gitlab.com>

Use pipeline url instead of id in release environments notification

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



Merged-by: Rémy Coutable <remy@rymai.me>
Approved-by: Huzaifa Iftikhar <hiftikhar@gitlab.com>
Approved-by: Rémy Coutable <remy@rymai.me>
Reviewed-by: Rémy Coutable <remy@rymai.me>
Reviewed-by: Huzaifa Iftikhar <hiftikhar@gitlab.com>
Co-authored-by: Dat Tang <dattang@gitlab.com>

(cherry picked from commit d7e6396b)

c8e77529

 Use pipeline url instead of id in release environments notification

Co-authored-by: Rémy Coutable <remy@rymai.me>

Backport 17.1: Field needs to be called Url

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



Merged-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Approved-by: Igor Drozdov <idrozdov@gitlab.com>
Approved-by: Jay McCure <jmccure@gitlab.com>
Reviewed-by: Vasilii Iakliushin <viakliushin@gitlab.com>

Fix merge unverified changes modal showing incorrectly

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



Merged-by: Phil Hughes <me@iamphill.com>
Approved-by: Kushal Pandya <kushal@gitlab.com>
Co-authored-by: Phil Hughes <phughes@gitlab.com>

Merge branch '468471-regression-debug-terminal-stops-to-work-in-17-1-due-to-invalid-websocket-scheme' into 'master' 

Field needs to be called Url

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



Merged-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Approved-by: Jaime Martinez <jmartinez@gitlab.com>
Approved-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Reviewed-by: Ash McKenzie <amckenzie@gitlab.com>
Co-authored-by: Ash McKenzie <amckenzie@gitlab.com>

(cherry picked from commit b5cf54b4)

bd553868

 Field needs to be called Url

Co-authored-by: Vasilii Iakliushin <viakliushin@gitlab.com>

https://gitlab.com/gitlab-org/gitlab/-/issues/469234


(cherry picked from commit d45d0fda)

d45d0fda

 Fix merge unverified changes modal showing incorrectly

Co-authored-by: Phil Hughes <me@iamphill.com>

Merge branch 'correct_finalize_epics_backfilling' into '17-1-stable-ee'

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



Merged-by: Eugenia Grieff <egrieff@gitlab.com>
Approved-by: Nicolas Dular <ndular@gitlab.com>
Approved-by: Eugenia Grieff <egrieff@gitlab.com>
Co-authored-by: Alexandru Croitor <acroitor@gitlab.com>

Correct finalize migration for BackfillEpicBasicFieldsToWorkItemRecord

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



Merged-by: Dylan Griffith <dyl.griffith@gmail.com>
Approved-by: Nikola Milojevic <nmilojevic@gitlab.com>
Approved-by: Dylan Griffith <dyl.griffith@gmail.com>
Reviewed-by: Nicolas Dular <ndular@gitlab.com>
Co-authored-by: Alexandru Croitor <acroitor@gitlab.com>

(cherry picked from commit fa7bb30a)

44d35633

 Correct finalize migration for BackfillEpicBasicFieldsToWorkItemRecord

Co-authored-by: Dylan Griffith <dyl.griffith@gmail.com>

Update FF version info for graphql_minimal_auth_methods

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



Merged-by: Jenny Kim <yjeankim@gitlab.com>
Approved-by: Jon Glassman <jglassman@gitlab.com>
Co-authored-by: Adil Farrukh <afarrukh@gitlab.com>

Merge branch 'echui-gitlab-master-patch-58822' into 'master'

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



Merged-by: Nicolas Dular <ndular@gitlab.com>
Approved-by: Alexandru Croitor <acroitor@gitlab.com>

Long-term quarantine ProductAnalytics::SyncFunnelsWorker

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



Merged-by: Heinrich Lee Yu <heinrich@gitlab.com>
Approved-by: Heinrich Lee Yu <heinrich@gitlab.com>
Co-authored-by: Emily Chui <echui@gitlab.com>

(cherry picked from commit bfc60ee0

)

8fdc44a5 Long-term quarantine ProductAnalytics::SyncFunnelsWorker 
a7102e54 Update file sync_funnels_worker_spec.rb

Co-authored-by: Heinrich Lee Yu <heinrich@gitlab.com>

Remove transaction opening for non-basic search count

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



Merged-by: Terri Chu <tchu@gitlab.com>
Approved-by: Terri Chu <tchu@gitlab.com>
Co-authored-by: Madelein van Niekerk <mvanniekerk@gitlab.com>

ci: For 17-1 Use default Ruby version for MRs targeting stable branches

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Use static AWS credentials for elasticsearch indexer if set

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



Merged-by: Terri Chu <tchu@gitlab.com>
Approved-by: Terri Chu <tchu@gitlab.com>
Co-authored-by: Madelein van Niekerk <mvanniekerk@gitlab.com>

Use static AWS credentials for elasticsearch indexer if set

Closes gitlab-com/enablement-sub-department/section-enable-request-for-help#80

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



Merged-by: Madelein van Niekerk <mvanniekerk@gitlab.com>
Approved-by: Dmitry Gruzd <dgruzd@gitlab.com>
Approved-by: Terri Chu <tchu@gitlab.com>
Reviewed-by: Terri Chu <tchu@gitlab.com>


(cherry picked from commit 87a09f57)

14207a5e

 Use static AWS credentials for indexer if set

Co-authored-by: Madelein van Niekerk <mvanniekerk@gitlab.com>

Remove transaction opening for non-basic search count

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



Merged-by: Gary Holtz <gholtz@gitlab.com>
Approved-by: Gary Holtz <gholtz@gitlab.com>
Co-authored-by: maddievn <mvanniekerk@gitlab.com>

(cherry picked from commit 6918adb5)

dcf811f4

 Remove transaction opening for non-basic search count

Co-authored-by: Gary Holtz <gholtz@gitlab.com>