According to:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3842

See:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3879#note_52648241

# Conflicts:
#	app/assets/images/icons.json
#	app/assets/images/icons.svg
#	app/assets/javascripts/ide/components/repo_file.vue
#	app/assets/javascripts/ide/lib/editor_options.js
#	app/assets/javascripts/monitoring/utils/date_time_formatters.js
#	app/assets/stylesheets/pages/merge_requests.scss
#	app/controllers/autocomplete_controller.rb
#	app/models/user.rb
#	app/services/search/global_service.rb
#	app/views/projects/tree/_tree_content.html.haml
#	app/views/projects/tree/_tree_header.html.haml
#	app/views/projects/tree/show.html.haml
#	app/workers/repository_import_worker.rb
#	doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md
#	doc/administration/auth/ldap.md
#	doc/ci/examples/browser_performance.md
#	doc/topics/authentication/index.md
#	doc/user/group/index.md
#	doc/workflow/rebase_before_merge.md
#	package.json
#	yarn.lock

[ci skip]

CE upstream - Tuesday

Closes gitlab-com/infrastructure#3416, gitlab-qa#140, and gl-sast#3

See merge request gitlab-org/gitlab-ee!3844

Migrate to Project#empty_repo?

Closes #41326

See merge request gitlab-org/gitlab-ce!16054

Postgres FDW documentation

See merge request gitlab-org/gitlab-ee!3076

Resolve Style/EmptyLambdaParameter violations

See merge request gitlab-org/gitlab-ee!3877

Use relative URLs when linking to uploaded files (EE)

See merge request gitlab-org/gitlab-ee!3814

Add note about using the term GPG for all related implementations

Closes #36970

See merge request gitlab-org/gitlab-ce!14887

Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_line by removing expensive diff position calculation and comparison

Closes #41406

See merge request gitlab-org/gitlab-ce!16111

Reverted fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788

See merge request gitlab-org/gitlab-ce!16118

Extend Cluster Applications to allow installation of Prometheus

Closes #41053

See merge request gitlab-org/gitlab-ce!15895

Docs: move articles LDAP-CE and LDAP-EE to its topic-related folder

See merge request gitlab-org/gitlab-ee!3866

Docs: move article LDAP-CE to its topic-related folder

See merge request gitlab-org/gitlab-ce!16094

Execute project hooks and services after commit when moving an issue

Closes #41324

See merge request gitlab-org/gitlab-ce!16108

Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_line by removing expensive diff position calculation and comparison