[merge-train skip]

[ci skip]

Prepare 16.2.1 release for gitlab-jh

See merge request gitlab-cn/gitlab!1877

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

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

Liuming Tan authored 2 years ago and Wenju Liu committed 2 years ago

Fix failed pipeline 1380299 through remove useless template

See merge request gitlab-cn/gitlab!1861

Liuming Tan authored 2 years ago and Wenju Liu committed 2 years ago

Refactor pages_url to follow upstream changes

See merge request gitlab-cn/gitlab!1858

Version v16.2.0-ee

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

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>

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>