[merge-train skip]

[ci skip]

Prepare 16.6.8 release for gitlab-jh

See merge request gitlab-cn/gitlab!2550

qa_selector_for_provider

[merge-train skip]

[ci skip]

[ci skip]

Pin ffi version on qa/gemfile

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Jenny Kim <yjeankim@gitlab.com>
Approved-by: Richard Chong <rchong@gitlab.com>
Approved-by: Thong Kuah <tkuah@gitlab.com>

Pin multi-xml gem and cherry-pick GDK fixes into 16.6

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Jenny Kim <yjeankim@gitlab.com>
Approved-by: Thong Kuah <tkuah@gitlab.com>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>
Co-authored-by: Mark Lapierre <mlapierre@gitlab.com>
Co-authored-by: Rémy Coutable <remy@rymai.me>

Update gitlab-development-kit digest to 93d5a88

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



Merged-by: Andrejs Cunskis <acunskis@gitlab.com>
Approved-by: Andrejs Cunskis <acunskis@gitlab.com>
Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>

Update gitlab-development-kit digest to dda0a97

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



Merged-by: Mark Lapierre <mlapierre@gitlab.com>
Approved-by: Mark Lapierre <mlapierre@gitlab.com>
Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>

Add job to re-tag gdk image on release tag creation

Closes gitlab-org/quality/quality-engineering/team-tasks#2385

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



Merged-by: Rémy Coutable <remy@rymai.me>
Approved-by: Rémy Coutable <remy@rymai.me>
Reviewed-by: Rémy Coutable <remy@rymai.me>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>

Pin multi-xml gem to overcome floating dependency issues
https://gitlab.com/gitlab-org/release/tasks/-/issues/11362.

Add a banner informing about token expiration

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



Merged-by: Maina Ng'ang'a <anganga@gitlab.com>
Approved-by: Lukas 'ai-pi' Eipert <leipert@gitlab.com>
Approved-by: Sofia Vistas <svistas@gitlab.com>
Co-authored-by: Richard Chong <rchong@gitlab.com>
Co-authored-by: GitLab Dependency Bot <leipert+gitlab-renovate-bot@gitlab.com>
Co-authored-by: Sanad Liaquat <sliaquat@gitlab.com>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>
Co-authored-by: Mark Lapierre <mlapierre@gitlab.com>
Co-authored-by: Will Meek <wmeek@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/156430



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/156398



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

Fix failing specs on 16-6-stable-ee

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Nao Hashizume <nhashizume@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Lin Jen-Shin <jen-shin@gitlab.com>
Co-authored-by: agius <andrew@atevans.com>

This should properly shutdown webrick so that we don't need to
forcefully kill the thread to shutdown webrick in the tests.

Without properly shutting down webrick, we leak threads and other
resources to each test cases, eventually causing everything to slow down
and timing out the CI jobs.

This is discovered in
https://gitlab.com/gitlab-org/gitlab/-/issues/462928#note_1916591506

A quick fix was proposed in the above thread and merged in
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153887

This should properly shutdown webrick instead.

* It should be safe to shutdown webrick regardless
* In a test, we use a thread to wrap around `WEBrick::HTTPServer`,
  turning the blocking server into a non-blocking server. This means
  the daemon thread will stop immediately because everything is
  wrapped inside another thread. If we only shutdown webrick when
  the thread is alive, we're not shutting it down in this test case
  either, leaking resources.

This preserves similar performance comparing to killing the thread.

This partially reverts
https://gitlab.com/gitlab-org/gitlab/-/commit/f5b1317af8aad2d8b7d098c0e4dada25ccfd924b

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.

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

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



Merged-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Chloe Liu <yliu@gitlab.com>
Co-authored-by: Mark Chao <mchao@gitlab.com>
Co-authored-by: Mark Lapierre <mlapierre@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>

Fix broken master

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



Merged-by: Mehmet Emin INAC <minac@gitlab.com>
Approved-by: Doug Stull <dstull@gitlab.com>


(cherry picked from commit d999b508)

cbfef8b8

 Fix broken master

Co-authored-by: Mehmet Emin INAC <minac@gitlab.com>

[merge-train skip]

Backport UUID migration finalization to 16.6

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Gregory Havenga <11164960-ghavenga@users.noreply.gitlab.com>
Approved-by: Harsha Muralidhar <hmuralidhar@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Simon Tomlinson <stomlinson@gitlab.com>

[merge-train skip]

[ci skip]

Prepare 16.6.7 release for gitlab-jh

See merge request gitlab-cn/gitlab!2314

[merge-train skip]

[ci skip]

[ci skip]