[merge-train skip]

[ci skip]

[ci skip]

Fix crash when LDAP CA file set outside tls_options

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



Merged-by: Kassio Borges <kborges@gitlab.com>
Approved-by: Kassio Borges <kborges@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>

Backport fix for pending direct uploads completion to 16.2

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



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

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

Fix completion of pending direct upload

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



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

(cherry picked from commit 26ed6f8d)

a3e85cee Fix completion of pending direct upload

Previously if `ldap_servers.ca_file` were set instead of
`ldap_servers.tls_options.ca_file`, the changes in
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122888 would
flag the call to `Gitlab::Options#delete`.

Unfortunately, the introduction of
`Gitlab::ErrorTracking.track_and_raise_for_dev_exception` in
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124396 caused
the process to crash with an undefined `devise` method in the `User`
module. This happened because the method attempted to load the `User`
for the application context, but since Devise is initialized in
`8_devise.rb`, this came too late for the LDAP config parsing in
`1_settings.rb`.

To avoid this error, avoid loading the `ApplicationContext` by using
`Gitlab::AppJsonLogger`.

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

Changelog: fixed

[merge-train skip]

[ci skip]

[ci skip]

[merge-train skip]

[merge-train skip]

[merge-train skip]

[merge-train skip]

Make buttons Pajama compliant

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



Merged-by: Simon Knox <simon@gitlab.com>
Approved-by: Hitesh Raghuvanshi <hraghuvanshi@gitlab.com>
Approved-by: Tan Le <tle@gitlab.com>
Approved-by: Simon Knox <simon@gitlab.com>
Reviewed-by: Huzaifa Iftikhar <hiftikhar@gitlab.com>
Reviewed-by: Tan Le <tle@gitlab.com>
Co-authored-by: huzaifaiftikhar1 <hiftikhar@gitlab.com>

Huzaifa Iftikhar authored 1 year ago and Simon Knox committed 1 year ago

Changelog: changed

Content editor: Fix layout shifting

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



Merged-by: Simon Knox <simon@gitlab.com>
Approved-by: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Approved-by: Simon Knox <simon@gitlab.com>
Co-authored-by: Sascha Eggenberger <seggenberger@gitlab.com>

Update Gitaly version

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



Merged-by: release-tools approver bot <project278964_bot6@example.com>
Approved-by: release-tools approver bot <project278964_bot6@example.com>
Co-authored-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>

Migrate Pajamas button in _signup_omniauth_provider_list.haml

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



Merged-by: Andrew Fontaine <afontaine@gitlab.com>
Approved-by: Andrew Fontaine <afontaine@gitlab.com>
Approved-by: Jarka Košanová <jarka@gitlab.com>
Co-authored-by: Sunjung Park <spark@gitlab.com>

Migrate buttons to Pajamas component

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



Merged-by: Simon Knox <simon@gitlab.com>
Approved-by: Diana Zubova <dzubova@gitlab.com>
Approved-by: Simon Knox <simon@gitlab.com>
Co-authored-by: Abdul Wadood <awadood@gitlab.com>

Abdul Wadood authored 1 year ago and Simon Knox committed 1 year ago

Migrate Normal view, Blame, History and Permalink buttons to Pajamas
component.

Changelog: other

Update mr widgets options tests

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



Merged-by: Jose Ivan Vargas <jvargas@gitlab.com>
Approved-by: Jose Ivan Vargas <jvargas@gitlab.com>
Reviewed-by: Alexander Turinske <aturinske@gitlab.com>
Co-authored-by: Alexander Turinske <aturinske@gitlab.com>

workhorse: Update module github.com/BurntSushi/toml to v1.3.2

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



Merged-by: Ash McKenzie <amckenzie@gitlab.com>
Approved-by: Ash McKenzie <amckenzie@gitlab.com>
Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>

workhorse: Update module github.com/prometheus/client_golang to v1.16.0

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



Merged-by: Ash McKenzie <amckenzie@gitlab.com>
Approved-by: Ash McKenzie <amckenzie@gitlab.com>
Approved-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Reviewed-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>

Add humanize support for branch types for security policies

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



Merged-by: Ezekiel Kigbo <3397881-ekigbo@users.noreply.gitlab.com>
Approved-by: Martin Čavoj <mcavoj@gitlab.com>
Approved-by: Russell Dickenson <rdickenson@gitlab.com>
Approved-by: Ezekiel Kigbo <3397881-ekigbo@users.noreply.gitlab.com>
Reviewed-by: Andrew Fontaine <afontaine@gitlab.com>
Reviewed-by: Alexander Turinske <aturinske@gitlab.com>
Reviewed-by: Martin Čavoj <mcavoj@gitlab.com>
Co-authored-by: Alexander Turinske <aturinske@gitlab.com>
Co-authored-by: Artur Fedorov <afedorov@gitlab.com>

- branch types are now supported for humanized
  messages for scan result policy

Changelog: added

EE: true

Fix count of all group members in autocomplete

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



Merged-by: Heinrich Lee Yu <heinrich@gitlab.com>
Approved-by: Jessie Young <jessieyoung@gitlab.com>
Approved-by: Marcos Rocha <mrocha@gitlab.com>
Reviewed-by: Heinrich Lee Yu <heinrich@gitlab.com>

Fix emoji version notes

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



Merged-by: Marcel Amirault <mamirault@gitlab.com>
Approved-by: Marcel Amirault <mamirault@gitlab.com>
Co-authored-by: Russell Dickenson <rdickenson@gitlab.com>

Changed user/admin to admin path

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



Merged-by: Marcel Amirault <mamirault@gitlab.com>
Approved-by: Marcel Amirault <mamirault@gitlab.com>
Co-authored-by: Suzanne Selhorn <sselhorn@gitlab.com>

Update dependency auto-build-image to v1.37.0

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



Merged-by: Hordur Freyr Yngvason <hfyngvason@gitlab.com>
Approved-by: Hordur Freyr Yngvason <hfyngvason@gitlab.com>
Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>

Optimise known_events lookup in hll redis counter

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



Merged-by: charlie ablett <cablett@gitlab.com>
Approved-by: Michał Wielich <mwielich@gitlab.com>
Approved-by: charlie ablett <cablett@gitlab.com>
Co-authored-by: Michał Wielich <mwielich@gitlab.com>
Co-authored-by: Sylvester Chin <schin@gitlab.com>

Sylvester Chin authored 1 year ago and Charlie Ablett committed 1 year ago

Changelog: performance
EE: true

Add GraphQL API to get compliance standards adherence at group level

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



Merged-by: Krasimir Angelov <kangelov@gitlab.com>
Approved-by: Evan Read <eread@gitlab.com>
Approved-by: Hitesh Raghuvanshi <hraghuvanshi@gitlab.com>
Approved-by: Aleksei Lipniagov <alipniagov@gitlab.com>
Approved-by: Tianwen Chen <tchen@gitlab.com>
Approved-by: Krasimir Angelov <kangelov@gitlab.com>
Reviewed-by: Evan Read <eread@gitlab.com>
Reviewed-by: Krasimir Angelov <kangelov@gitlab.com>
Reviewed-by: Aleksei Lipniagov <alipniagov@gitlab.com>
Reviewed-by: Huzaifa Iftikhar <hiftikhar@gitlab.com>
Reviewed-by: Hitesh Raghuvanshi <hraghuvanshi@gitlab.com>
Reviewed-by: Tianwen Chen <tchen@gitlab.com>
Co-authored-by: huzaifaiftikhar1 <hiftikhar@gitlab.com>

Huzaifa Iftikhar authored 1 year ago and Krasimir Angelov committed 1 year ago

Add 'project_compliance_standards_adherence' field to Group type for
fetching compliance standards adherence for projects within a group and
its subgroups.

Changelog: added
EE: true

Fix typo in gitlab

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



Merged-by: Marcel Amirault <mamirault@gitlab.com>
Approved-by: Marcel Amirault <mamirault@gitlab.com>
Co-authored-by: Brie Carranza <bcarranza@gitlab.com>

Update generate test file AI trigger to support Vertex AI

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



Merged-by: Kerri Miller <kerrizor@kerrizor.com>
Approved-by: Kerri Miller <kerrizor@kerrizor.com>
Co-authored-by: Phil Hughes <me@iamphill.com>

Fix MR throughput on the Value Stream Dashboard

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



Merged-by: Ezekiel Kigbo <3397881-ekigbo@users.noreply.gitlab.com>
Approved-by: Ezekiel Kigbo <3397881-ekigbo@users.noreply.gitlab.com>
Co-authored-by: Alex Pennells <apennells@gitlab.com>