[merge-train skip]

[ci skip]

[ci skip]

Replace vscode-cdn.net with web-ide.gitlab-static.net (Backport)

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



Merged-by: Kerri Miller <kerrizor@kerrizor.com>
Approved-by: Kerri Miller <kerrizor@kerrizor.com>
Co-authored-by: Enrique Alcántara <ealcantara@gitlab.com>

Fix broken dependency list for invalid Container Scanning pkg mgr type

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



Merged-by: Kerri Miller <kerrizor@kerrizor.com>
Approved-by: Adam Cohen <acohen@gitlab.com>
Approved-by: Kerri Miller <kerrizor@kerrizor.com>

Enrique Alcántara authored 1 year ago and Paul Slaughter committed 1 year ago

- (cherry picked from commit ae41ed4d)
- https://gitlab.com/gitlab-org/gitlab/-/issues/414488

Changelog: fixed

Kerri Miller authored 1 year ago and Thiago Figueiro committed 1 year ago

Fix broken dependency list for invalid Container Scanning pkg mgr type

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



Merged-by: Kerri Miller <kerrizor@kerrizor.com>
Approved-by: Kerri Miller <kerrizor@kerrizor.com>
Co-authored-by: Adam Cohen <acohen@gitlab.com>

Revert "Remove log_response_length feature flag" - 16.2 Backport

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



Merged-by: Bob Van Landuyt <bob@gitlab.com>
Approved-by: Bob Van Landuyt <bob@gitlab.com>
Co-authored-by: Robert May <rmay@gitlab.com>

Put back broadcast messages to sign-in page for self-hosted

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



Merged-by: Phil Hughes <me@iamphill.com>
Approved-by: Rajendra Kadam <rkadam@gitlab.com>
Approved-by: Phil Hughes <me@iamphill.com>
Reviewed-by: Rajendra Kadam <rkadam@gitlab.com>
Co-authored-by: Jessie Young <jessieyoung@gitlab.com>

Backport Fix max number of slices to 16.2

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



Merged-by: John Mason <9717668-johnmason@users.noreply.gitlab.com>
Approved-by: John Mason <9717668-johnmason@users.noreply.gitlab.com>

This reverts commit cd158c29.

This reverts commit 5ecf8069. This
introduced a regression for LFS file fetching when stored outside
of object storage.

Changelog: fixed

John Mason authored 1 year ago and Dmitry Gruzd committed 1 year ago

Fix max number of slices

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



Merged-by: John Mason <9717668-johnmason@users.noreply.gitlab.com>
Approved-by: John Mason <9717668-johnmason@users.noreply.gitlab.com>
Co-authored-by: Dmitry Gruzd <dgruzd@gitlab.com>
Co-authored-by: Ravi Kumar <rkumar@gitlab.com>

(cherry picked from commit 055128ee)

976c757e Fix max number of slices
56d34b74 Apply 1 suggestion(s) to 1 file(s)
72ed52d5 Apply 1 suggestion(s) to 1 file(s)
22c022a9 Test get_number_of_shards and get_max_slices

Jessie Young authored 1 year ago and Serhii Yarynovskyi committed 1 year ago

Put back broadcast messages to sign-in page for self-hosted

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



Merged-by: Jessie Young <jessieyoung@gitlab.com>
Approved-by: Jessie Young <jessieyoung@gitlab.com>
Approved-by: Jay Montal <jmontal@gitlab.com>
Approved-by: Allen Cook <acook@gitlab.com>
Reviewed-by: Jay Montal <jmontal@gitlab.com>
Co-authored-by: syarynovskyi <syarynovskyi@gitlab.com>

(cherry picked from commit f7edfbcc)

6416896f Put back broadcast messages to signin page for self-hosted

Backport '420347-fix-new-index-settings' to 16.2

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



Merged-by: Madelein van Niekerk <mvanniekerk@gitlab.com>
Approved-by: Madelein van Niekerk <mvanniekerk@gitlab.com>

[merge-train skip]

[ci skip]

[ci skip]

Backport "Fix artifacts object storage geo replication" to 16.2

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



Merged-by: Michael Kozono <mkozono@gitlab.com>
Approved-by: Michael Kozono <mkozono@gitlab.com>

Michael Kozono authored 1 year ago and Frederick Bajao committed 1 year ago

Fix artifacts object storage geo replication

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



Merged-by: Michael Kozono <mkozono@gitlab.com>
Approved-by: Michael Kozono <mkozono@gitlab.com>
Reviewed-by: Michael Kozono <mkozono@gitlab.com>
Reviewed-by: Erick Bajao <fbajao@gitlab.com>
Reviewed-by: Albert Salim <asalim@gitlab.com>
Co-authored-by: Erick Bajao <fbajao@gitlab.com>

(cherry picked from commit 8f9de66a)

eeef8e59 Fix artifacts object storage geo replication
69f402ed Explain why we need to override store method
ccdd72cd Improve specs and explanation

Madelein van Niekerk authored 1 year ago and Dmitry Gruzd committed 1 year ago

Fix settings for newly created incides

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



Merged-by: Madelein van Niekerk <mvanniekerk@gitlab.com>
Approved-by: Ravi Kumar <rkumar@gitlab.com>
Approved-by: Madelein van Niekerk <mvanniekerk@gitlab.com>
Co-authored-by: Dmitry Gruzd <dgruzd@gitlab.com>

(cherry picked from commit c95cf439)

09ff9c1a Fix settings for newly created incides
c27bf0ed fixup! Fix settings for newly created incides
27c59225 fixup! Fix settings for newly created incides

[merge-train skip]

[ci skip]

[ci skip]

Merge branch 'security-46403887-fix-list-dependencies-undefined-method-licenses-bug-16-2' into '16-2-stable-ee'

Fix undefined method licenses for nil:NilClass bug

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



Merged-by: Reuben Pereira <2967854-rpereira2@users.noreply.gitlab.com>
Approved-by: Kerri Miller <kerrizor@kerrizor.com>
Co-authored-by: Adam Cohen <acohen@gitlab.com>

Merge branch 'security-46403887-fix-list-dependencies-undefined-method-licenses-bug-16-2' into '16-2-stable-ee'

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

Changelog: security

Fix undefined method page error in list dependencies

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



Merged-by: Reuben Pereira <2967854-rpereira2@users.noreply.gitlab.com>
Approved-by: Kerri Miller <kerrizor@kerrizor.com>
Co-authored-by: Adam Cohen <acohen@gitlab.com>

Merge branch 'security-46403887-fix-list-dependencies-bug-16-2' into '16-2-stable-ee'

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

Changelog: security

Add pagination for license scanning

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



Merged-by: Steve Abrams <sabrams@gitlab.com>
Approved-by: Tetiana Chupryna <tchupryna@gitlab.com>
Co-authored-by: atiwari71 <atiwari@gitlab.com>

Aditya Tiwari authored 1 year ago and Steve Abrams committed 1 year ago

Merge branch 'security-paginate-dependency-list-dos-16-2' into '16-2-stable-ee'

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

Changelog: security

Prevent leaking emails of newly created users

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



Merged-by: Reuben Pereira <2967854-rpereira2@users.noreply.gitlab.com>
Approved-by: Sashi Kumar Kumaresan <skumar@gitlab.com>
Co-authored-by: Bogdan Denkovych <bdenkovych@gitlab.com>

Merge branch 'security-prevent-leaking-emails-of-newly-created-users-16-2' into '16-2-stable-ee'

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

Changelog: security

Added redirect to filtered params

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Jessie Young <jessieyoung@gitlab.com>
Co-authored-by: smriti <sgarg@gitlab.com>

Smriti Garg authored 1 year ago and GitLab Release Tools Bot committed 1 year ago

Merge branch 'security-906-glpat-logging-16-2' into '16-2-stable-ee'

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

Changelog: security

Relocate PlantUML config and disable SVG support

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: John Mason <9717668-johnmason@users.noreply.gitlab.com>
Co-authored-by: Robert May <rmay@gitlab.com>

Robert May authored 1 year ago and GitLab Release Tools Bot committed 1 year ago

Merge branch 'security-416902-config-16-2' into '16-2-stable-ee'

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

Changelog: security

Sanitize multiple hardlinks from import archives

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: George Koltsov <gkoltsov@gitlab.com>
Co-authored-by: Luke Duncalfe <lduncalfe@eml.cc>

Luke Duncalfe authored 1 year ago and GitLab Release Tools Bot committed 1 year ago

Merge branch 'security-hardlinks-in-import-archives-16-2' into '16-2-stable-ee'

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

Changelog: security

Validates project path availability

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



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