[merge-train skip]

[ci skip]

Prepare 16.8.8 release for gitlab-jh

See merge request gitlab-cn/gitlab!2548

[merge-train skip]

[ci skip]

[ci skip]

Add a banner informing about token expiration

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



Merged-by: Jenny Kim <yjeankim@gitlab.com>
Approved-by: Lukas 'ai-pi' Eipert <leipert@gitlab.com>
Approved-by: Tiffany Rea <trea@gitlab.com>
Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>
Co-authored-by: Sanad Liaquat <sliaquat@gitlab.com>
Co-authored-by: Eduardo Sanz García <esanz-garcia@gitlab.com>

Display a banner to all users, similar to broadcast banners, for GitLab
version between 16.0 and 17.0, both included. The banner informs about
upcoming expiration of tokens and how to troubleshoot the expiration.

The banner is dismissable. The data is persisted in the browser cookie
and expires in one year from the date it has been dismissed. Like other
broadcast banners, if the user opens an incognito window the banner
reappears.

Changelog: changed

Prevent starting multiple Capybara proxy servers

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Heinrich Lee Yu <heinrich@gitlab.com>

Update an expired test certificate

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Vasilii Iakliushin <viakliushin@gitlab.com>

This code is run every time a new Capybara browser session is started.
Running this code multiple times causes subsequent feature specs to slow
down considerably.

Contributes to
https://gitlab.com/gitlab-org/quality/engineering-productivity/master-broken-incidents/-/issues/6747

**Problem**

The previous certificate that was used in tests got expired. As a result
tests started failing with "tls: failed to verify certificate: x509:
certificate has expired or is not yet valid: current time
2024-06-07T06:16:03Z is after 2024-06-07T04:31:24Z"

**Solution**

Reissue a certificate with an expiration date "Aug 24 09:26:29 2032 GMT"

Changelog: fixed

Stop orphaning pages deployments on Geo secondaries on 16.8

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Approved-by: Michael Kozono <mkozono@gitlab.com>
Approved-by: Désirée Chevalier <dchevalier@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Kassio Borges <kborges@gitlab.com>

Fix Geo migration spec

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



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

Cherry pick add job to re-tag gdk image on release tag creation to 16.8

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



Merged-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Alan (Maciej) Paruszewski <mparuszewski@gitlab.com>
Co-authored-by: Jennifer Li <jli@gitlab.com>
Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>
Co-authored-by: GitLab Dependency Bot <leipert+gitlab-renovate-bot@gitlab.com>

Quarantine base_exporter_spec to reduce job timeout

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



Merged-by: Max Fan <mfan@gitlab.com>
Approved-by: Paul Phillips <pjphillips@gitlab.com>
Approved-by: Nao Hashizume <nhashizume@gitlab.com>
Approved-by: Max Fan <mfan@gitlab.com>
Co-authored-by: Jennifer Li <jli@gitlab.com>

(cherry picked from commit 6797a1e2

)

5a4e3345 Quarantine base_exporter_spec

Co-authored-by: Max Fan <mfan@gitlab.com>

The test was failing in CI because the Geo CI job artifact registry
had cached the newer state of the columns that no longer had the
`success` column. `migrate!` doesn't reset the column information.
This change resets the state so that the migration spec passes.

[merge-train skip]

Ensure to run all rails logic when deleting pages deployments

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



Merged-by: Erick Bajao <fbajao@gitlab.com>
Approved-by: Adie (she/her) <avpfestin@gitlab.com>
Approved-by: Erick Bajao <fbajao@gitlab.com>
Reviewed-by: Kassio Borges <kborges@gitlab.com>
Co-authored-by: Kassio Borges <kassioborgesm@gmail.com>

(cherry picked from commit c2b357bf)

21bc7359

 Ensure to run all rails logic when deleting pages deployments

Co-authored-by: Erick Bajao <fbajao@gitlab.com>

[merge-train skip]

[ci skip]

Prepare 16.8.7 release for gitlab-jh

See merge request gitlab-cn/gitlab!2415

[merge-train skip]

[ci skip]

[ci skip]

[merge-train skip]

[ci skip]

Prepare 16.8.6 release for gitlab-jh

See merge request gitlab-cn/gitlab!2408

[merge-train skip]

[ci skip]

[ci skip]

Update Gitlab::Regex::Packages#slack_link_regex

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



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Mikołaj Wawrzyniak <mwawrzyniak@gitlab.com>
Co-authored-by: George Koltsov <gkoltsov@gitlab.com>

Merge branch 'security-redos-integrations-16-8' into '16-8-stable-ee'

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

Changelog: security