[ci skip]

# Conflicts:
#	app/assets/javascripts/sidebar/sidebar_mediator.js
#	app/assets/stylesheets/pages/groups.scss
#	app/controllers/projects/merge_requests_controller.rb
#	app/models/epic.rb
#	app/models/user.rb
#	app/policies/group_policy.rb
#	app/services/ci/create_pipeline_service.rb
#	app/services/protected_branches/access_level_params.rb
#	app/services/protected_branches/api_service.rb
#	app/views/layouts/_search.html.haml
#	app/views/layouts/nav/sidebar/_group.html.haml
#	app/views/projects/commits/_commit.html.haml
#	app/views/projects/issues/show.html.haml
#	app/views/shared/_outdated_browser.html.haml
#	config/routes/group.rb
#	doc/administration/index.md
#	doc/administration/operations/index.md
#	doc/development/automatic_ce_ee_merge.md
#	doc/development/limit_ee_conflicts.md
#	lib/api/entities.rb
#	lib/api/projects.rb
#	lib/banzai/filter/epic_reference_filter.rb
#	lib/banzai/filter/upload_link_filter.rb
#	lib/banzai/reference_parser/epic_parser.rb
#	lib/gitlab/ci/pipeline/chain/command.rb
#	lib/gitlab/git_access.rb
#	lib/gitlab/utils.rb
#	spec/helpers/boards_helper_spec.rb
#	spec/helpers/merge_requests_helper_spec.rb
#	spec/javascripts/boards/boards_store_spec.js
#	spec/lib/banzai/filter/upload_link_filter_spec.rb
#	spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb
#	spec/models/namespace_spec.rb

[ci skip]

rename remaining issue_ prefixed files

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

Ignore temporary table in schema

Closes #40976

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

Docs: move contributor analytics doc to correct location

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

Gitaly mirroring migration prep

Closes gitaly#816

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

[EE] gitaly mirroring prep

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

Backport epic in issue

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

fixes some markup issues in the js style guide docs

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

Remove the Plan seed entirely and add factories to create them on-demand

Closes #4247

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

CE upstream - Wednesday

Closes gitlab-ce#40543, gitaly#780, and gitaly#764

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

Containing epic

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

Moved URL utility methods into exported es modules

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

EE port of url-utility-es-module

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

EE- 35724 animate sidebar

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

Animate contextual sidebar; change class names for easier readability

Closes #35724

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

Docs: add index for doc/administration/operations/

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

Docs: add index for `doc/administration/operations/`

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

Standardise on self-signed certificates for PostgreSQL TLS

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

Add cop for use of remove_column

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

small change to make less conflict with EE version

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

Resolve merge conflicts with dev.gitlab.org/master after security release (EE port)

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

remove_column should only be used in the up (or change) step of a migration if
it's a post-deployment migration. Otherwise there will be downtime due to the
ActiveRecord column cache, which we can avoid by using the IgnorableColumn
concern in combination with a post-deployment migration.

Resolve merge conflicts with dev.gitlab.org/master after security release

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

Pick 10.2.4 security fixes into master (EE port)

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

Remove allocation tracking code from InfluxDB sampler for performance

Closes gitlab-com/infrastructure#3250

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

Remove issues.assignee_id column

Closes #30453

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