[merge-train skip]

[ci skip]

[ci skip]

Update ruby-saml and omniauth-saml

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Jim Baumgardner <jbaumgardner@gitlab.com>
Approved-by: Andrew Evans <aevans@gitlab.com>
Approved-by: Aboobacker MK <akarakath@gitlab.com>
Co-authored-by: Drew Blessing <drew@gitlab.com>

[merge-train skip]

[ci skip]

[ci skip]

Backport add Rake task to show token expiration info

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



Merged-by: John Skarbek <jskarbek@gitlab.com>
Approved-by: Jon Glassman <jglassman@gitlab.com>
Approved-by: Imre Farkas <ifarkas@gitlab.com>
Approved-by: Richard Chong <rchong@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Jon Glassman <jglassman@gitlab.com>

Update the token expiration banner (16.6)

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



Merged-by: John Skarbek <jskarbek@gitlab.com>
Approved-by: Imre Farkas <ifarkas@gitlab.com>
Approved-by: Sofia Vistas <svistas@gitlab.com>
Co-authored-by: Eduardo Sanz García <esanz-garcia@gitlab.com>

Reviews in 16.0-17.0 backports have introduced a few changes and we
would like to bring those to master:

- hide banner depending on `GITLAB_DISABLE_TOKEN_EXPIRATION_BANNER` env
  variable
- hide banner on tests
- updated banner message and use a namespace
- correct GitLab version check

Do not enqueue PAT expiry enforcement migration

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



Merged-by: John Skarbek <jskarbek@gitlab.com>
Approved-by: Alper Akgun <aakgun@gitlab.com>
Approved-by: Smriti Garg <sgarg@gitlab.com>
Approved-by: Sofia Vistas <svistas@gitlab.com>
Co-authored-by: Imre Farkas <ifarkas@gitlab.com>
Co-authored-by: agius <andrew@atevans.com>

Changelog: changed

Backport token logging improvements

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



Merged-by: John Skarbek <jskarbek@gitlab.com>
Approved-by: Imre Farkas <ifarkas@gitlab.com>
Approved-by: Sofia Vistas <svistas@gitlab.com>
Co-authored-by: Alex Pooley <apooley@gitlab.com>
Co-authored-by: Dylan Griffith <dyl.griffith@gmail.com>
Co-authored-by: Imre Farkas <ifarkas@gitlab.com>
Co-authored-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Co-authored-by: Aboobacker MK <akarakath@gitlab.com>

Fix order-dependent test failure in loose_foreign_keys_spec.rb

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



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

Changelog: other

Remove build-gdk-image, e2e:test-on-gdk, and retag-gdk-image jobs

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Nao Hashizume <nhashizume@gitlab.com>

Stan Hu authored 7 months ago and Smriti Garg committed 7 months ago

https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157277 added the
`meta.auth_fail_reason` and `meta.auth_fail_token_id` log fields to
identify expired access tokens. This commit documents these fields.

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

Update for failing docs-lint

Jon Glassman authored 7 months ago and Smriti Garg committed 7 months ago

Update for failing docs-lint

Stan Hu authored 7 months ago and Smriti Garg committed 7 months ago

Ideally we would remove these legacy scripts entirely or move
them into another section, but until we are confident that
this tool covers the needs of most users let's keep it for now.
We'll need to update the documentation as to what backported
GitLab versions contains this Rake task.

Stan Hu authored 7 months ago and Smriti Garg committed 7 months ago

This documents the Rake task added in
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157855.

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

Stan Hu authored 7 months ago and Smriti Garg committed 7 months ago

Now that we've decided that admins can allow tokens to have
no expiration date, bring back the option to remove them.

Stan Hu authored 8 months ago and Smriti Garg committed 7 months ago

Running `rake gitlab:tokens:edit` will provide an interface
to extend/remove tokens.

Stan Hu authored 8 months ago and Smriti Garg committed 7 months ago

This task adds a Rake task `gitlab:tokens:analyze` and gives
a readout to the admin about:

- When the migration in 16.0 for
  https://gitlab.com/gitlab-org/gitlab/-/issues/369123 started and
  finished

- The top 10 expiration dates
  (https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157782)
  https://gitlab.com/gitlab-org/gitlab/-/issues/467313

There should be a strong correlation with the migration dates and the
expiration dates. Seeing both of them together helps focus on the
tokens that were assigned an `expires_at` field in the background
migration.

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

Changelog: added

Add more log fields in 401 Unauthorized requests

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



Merged-by: Alex Pooley <apooley@gitlab.com>
Approved-by: Tarun Vellishetty <tvellishetty@gitlab.com>
Approved-by: Shreyas Agarwal <sagarwal@gitlab.com>
Approved-by: Alex Pooley <apooley@gitlab.com>
Approved-by: Imre Farkas <ifarkas@gitlab.com>
Reviewed-by: Alex Pooley <apooley@gitlab.com>
Reviewed-by: Shreyas Agarwal <sagarwal@gitlab.com>
Co-authored-by: smriti <sgarg@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>

Log token info for GraphQL requests

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



Merged-by: Dylan Griffith <dyl.griffith@gmail.com>
Approved-by: Dmytro Biryukov <dbiryukov@gitlab.com>
Approved-by: Greg Myers <gmyers@gitlab.com>
Approved-by: Imre Farkas <ifarkas@gitlab.com>
Approved-by: Dylan Griffith <dyl.griffith@gmail.com>
Reviewed-by: Dmytro Biryukov <dbiryukov@gitlab.com>
Co-authored-by: unset <fveillette@gitlab.com>
Co-authored-by: Dominic Couture <dcouture@gitlab.com>

Fix 500 errors during ActionCable connect

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



Merged-by: Imre Farkas <ifarkas@gitlab.com>
Approved-by: Heinrich Lee Yu <heinrich@gitlab.com>
Approved-by: Imre Farkas <ifarkas@gitlab.com>
Co-authored-by: Manoj M J <mmj@gitlab.com>

Ensure PAT scope is validated everywhere for GraphQL/ActionCable

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



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

Add token authorization to ActionCable

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



Merged-by: Aboobacker MK <akarakath@gitlab.com>
Approved-by: Serena Fang <sfang@gitlab.com>
Approved-by: Allison Browne <abrowne@gitlab.com>
Approved-by: Ottilia Westerlund <12746880-ottilia_westerlund@users.noreply.gitlab.com>
Approved-by: Aboobacker MK <akarakath@gitlab.com>
Co-authored-by: Pavel Shutsin <pshutsin@gitlab.com>

ci: For 16-6 Use default Ruby version for MRs targeting stable branches

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



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: Rémy Coutable <remy@rymai.me>

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

[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>

Andrejs Cunskis authored 10 months ago and Mayra Cabrera committed 8 months ago

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>