See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3929

# Conflicts:
#	app/assets/javascripts/boards/boards_bundle.js
#	app/assets/javascripts/boards/services/board_service.js
#	app/assets/javascripts/ide/components/repo_file.vue
#	app/assets/javascripts/ide/components/repo_tab.vue
#	app/models/project.rb
#	app/models/service.rb
#	app/serializers/merge_request_widget_entity.rb
#	lib/gitlab/git/repository.rb
#	spec/controllers/projects/artifacts_controller_spec.rb
#	spec/lib/gitlab/bare_repository_import/importer_spec.rb
#	spec/lib/gitlab/git/repository_spec.rb
#	spec/models/namespace_spec.rb
#	spec/models/project_spec.rb
#	spec/models/service_spec.rb

[ci skip]

CE upstream - Wednesday

Closes gitaly#813, #3482, gitaly#847, and gitaly#852

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

Resolve "Broken master due to `static-analysis`"

Closes #41685

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

Fix rebase status check throwing flash message

Closes #4473

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

Create Kubernetes based on Application Templates

Closes #41056

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

Scroll to top/bottom in issue board when reach to edges

Closes #39709

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

Fix missing d3 timeWeek import in prometheus graph

Closes #41644

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

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

Check if shard configuration is same across Geo nodes

Closes #3243

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

Update Kubernetes service documentation

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

Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4473

Added multi editor setting on the profile preferences page

Closes #41272

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

Do not run ee_compat_check on security branches

Closes #41396

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

States this service was deprecated on 10.3 and his behavior depends on
the kubernetes service status. Also includes a link for the release post
for more information.

Moves prettier to dev dependency

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

Remove downcase from special path helper

Closes #41590

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

Eager load event target authors whenever possible

Closes #41618

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

Rename db:seed_fu-{pg,mysql} to gitlab:setup-{pg,mysql}

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

Merge branch '41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclass' into 'master'

Resolve "Error 500 trying to view a merge request JSON: undefined method `binary?' for nil:NilClass"

Closes #41468

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

CE Port: 41054 Disable creation of new kubernetes integrations

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