# Conflicts:
#	app/assets/javascripts/dispatcher.js
#	app/assets/stylesheets/framework.scss
#	doc/ci/autodeploy/index.md
#	doc/ci/examples/README.md
#	doc/ci/examples/dast.md
#	doc/ci/examples/sast_docker.md
#	doc/install/README.md
#	doc/topics/autodevops/index.md
#	spec/spec_helper.rb

[ci skip]

CE upstream - Monday

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

CE: Override module to specify that we're overriding

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

Override module to specify that we're overriding

Closes #1819

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

Docs: deprecates articles index

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

Docs: deprecates articles index

Closes #41138

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

Make forking protect default branch on completion

Closes #19493

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

Migrate importing repository to Gitaly

Closes gitaly#907

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

Resolve "Managed Prometheus deployment installs a lot of extra stuff"

Closes #41799

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

Improve various Geo FDW queries that need aggregate pushdown to be fast

Closes #4491

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

Use an at_exit hook to stop test gitaly

Closes #41991

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

Use an at_exit hook to stop test gitaly

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

Docs: fix duplicate sections (CI docs)

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

Docs: fix duplicate sections (CI docs) - Backport to CE

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

Resolve "rake gitlab:shell:install creates ~git/.ssh/environment which gitlab:check complains about"

Closes #38540

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

Remove a changelog item that is added to CE (to prevent duplicating)

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

Refactored import of projects:tags:* and projects:tree:* of dispatcher.js

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

Bump Gitaly version to 0.69.0

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

Backport StackedProgressBar component from GitLab EE

Closes #41856

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

Docs: move article "Undo possibilities in Git" into its topic-related dir

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

Docs: move article "Undo possibilities in Git" into its topic-related dir

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

Closes gitaly#907

[API] Fix creating issue when assignee_id is empty

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