[merge-train skip]

[merge-train skip]

[ci skip]

[ci skip]

Update ruby-saml and omniauth-saml

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



Merged-by: Ahmad Tolba <atolba@gitlab.com>
Approved-by: Andrew Evans <aevans@gitlab.com>
Approved-by: Greg Alfaro <galfaro@gitlab.com>
Approved-by: Greg Myers <gmyers@gitlab.com>
Approved-by: Jim Baumgardner <jbaumgardner@gitlab.com>
Approved-by: Aboobacker MK <akarakath@gitlab.com>
Co-authored-by: Drew Blessing <drew@gitlab.com>

[merge-train skip]

[ci skip]

[ci skip]

Merge branch 'port-to-17-0-471727-jobartifactstate-checksummed_count-query-timing-out' into '17-0-stable-ee' 

Backport to 17.0: Fix JobArtifactState query timeout

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



Merged-by: John Skarbek <jskarbek@gitlab.com>
Approved-by: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Co-authored-by: Adam Hegyi <ahegyi@gitlab.com>

Merge remote-tracking branch 'origin/468509-backport-to-17-0-fixes-geo-replication-details-incorrectly-empty' into 17-0-stable-ee

Resolve "JobArtifactState.checksummed_count query timing out"

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



Merged-by: Adam Hegyi <ahegyi@gitlab.com>
Approved-by: Josianne Hyson <jhyson@gitlab.com>
Approved-by: Terri Chu <tchu@gitlab.com>
Approved-by: Adam Hegyi <ahegyi@gitlab.com>
Reviewed-by: Josianne Hyson <jhyson@gitlab.com>
Reviewed-by: Terri Chu <tchu@gitlab.com>
Co-authored-by: pkanellidis <pkanellidis@gitlab.com>

The introduction of GITLAB_LOG_LEVEL setting in Sidekiq for GitLab
17.0 via https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149790
caused an unexpected problem when `debug` mode were set: it would
lead Sidekiq into an infinite recursion, ultimately resulting in a
SystemStackError and causing it to crash.

At startup, Sidekiq logs a debug message with a `@config` Hash that
references `Sidekiq::Rails::Reloader`. `Sidekiq::Rails::Reloader` has
a reference to `Gitlab::Application` via the `@app` instance variable.

When `#to_json` is called, the `@app` gets called, when eventually
causes `#to_json` to be called on `@config` again, leading to an
circular reference.

Sidekiq 7.2.4 fixed this problem via
https://github.com/sidekiq/sidekiq/pull/6198 by implementing
a `#to_hash` method in `Sidekiq::Rails::Reloader`, which avoids
serializing `@app`.

This commit picks the fix in Sidekiq 7.2.4 for our vendored Sidekiq
7.1.6 because it is straightforward fix. Upgrading to Sidekiq 7.2.4 is
a bit more involved and not necessary here
(https://gitlab.com/gitlab-org/gitlab/-/merge_requests/163593).

Relates to https://gitlab.com/gitlab-org/gitlab/-/issues/473182

Changelog: fixed

Backport 17.0: Always build assets image when tagging

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



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

Always build assets image when tagging

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



Merged-by: Dat Tang <dattang@gitlab.com>
Approved-by: David Dieulivol <ddieulivol@gitlab.com>


(cherry picked from commit 4ab24a70)

4a303817 Always build assets image when tagging

Co-authored-by: Dat Tang <dattang@gitlab.com>

Original merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/159666

Issue:
https://gitlab.com/gitlab-org/gitlab/-/issues/468509

Changelog: fixed
EE: true

Update minimum Go version requirement for self-compiled (17.0)

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: John Skarbek <jskarbek@gitlab.com>
Approved-by: Amy Qualls <aqualls@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Achilleas Pipinellis <axil@gitlab.com>

Backport canonical RE downstream pipeline removal

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Jennifer Li <jli@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Jennifer Li <jli@gitlab.com>

Jennifer Li authored 6 months ago and Jenny Kim committed 6 months ago

Remove release-environment downstream pipeline from canonical

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



Merged-by: Jennifer Li <jli@gitlab.com>
Approved-by: Dat Tang <dattang@gitlab.com>
Approved-by: Jennifer Li <jli@gitlab.com>
Co-authored-by: Jenny Kim <yjeankim@gitlab.com>

Backport 17.0 - Do not run release-environments on tagging

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



Merged-by: Dat Tang <dattang@gitlab.com>
Approved-by: Jennifer Li <jli@gitlab.com>

Do not run release-environments on tagging

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



Merged-by: Dat Tang <dattang@gitlab.com>
Approved-by: Jennifer Li <jli@gitlab.com>


(cherry picked from commit d6dabc6e)

e44e1c6d Do not run release-environments on tagging

Co-authored-by: Dat Tang <dattang@gitlab.com>

Fix merge unverified changes modal showing incorrectly

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



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

(cherry picked from commit 5b4e955b)

d45d0fda Fix merge unverified changes modal showing incorrectly

Co-authored-by: Kushal Pandya <kushal@gitlab.com>

Backport 17.0: Build assets image when running release environments

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



Merged-by: Dat Tang <dattang@gitlab.com>
Approved-by: David Dieulivol <ddieulivol@gitlab.com>

[merge-train skip]

[ci skip]

[ci skip]

Show correct file content

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Jerry Seto <jseto@gitlab.com>
Co-authored-by: hustewart <hustewart@gitlab.com>

Daniel Stewart authored 6 months ago and GitLab Release Tools Bot committed 6 months ago

Merge branch 'security-show-correct-file-content-17-0' into '17-0-stable-ee'

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

Changelog: security

Fix Possible asciidoctor include:: directive DOS

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Dylan Griffith <dyl.griffith@gmail.com>
Co-authored-by: Olaoluwa Oluro <olaoluro@gitlab.com>

Ola Oluro authored 6 months ago and GitLab Release Tools Bot committed 6 months ago

Merge branch 'security-possible-dos-using-asciidoctor-include-17-0' into '17-0-stable-ee'

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

Changelog: security

Filter parameters in Rack::Attack logs

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



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

Andrew Evans authored 6 months ago and GitLab Release Tools Bot committed 6 months ago

Merge branch 'security-atevans-rack-attack-parameter-filter-17-0' into '17-0-stable-ee'

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

Changelog: security

Always build assets image when running release environments

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



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

(cherry picked from commit ade31c42)

20a4c453 Always build assets image when running release environments

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