# Conflicts:
#	app/assets/javascripts/repo/components/repo_tab.vue
#	app/models/application_setting.rb
#	app/models/ci/runner.rb
#	app/services/merge_requests/build_service.rb
#	app/services/projects/hashed_storage/migrate_attachments_service.rb
#	app/services/projects/hashed_storage/migrate_repository_service.rb
#	app/services/projects/update_service.rb
#	db/schema.rb
#	lib/gitlab/gitaly_client.rb
#	spec/services/projects/update_service_spec.rb

[ci skip]

fix link that was linking to `html` instead of `md`

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

Remove serialised diff and commit columns

Closes #39533

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

Create fork networks for deleted source projects

Closes #40072

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

Minor backport from EE

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

Rescheduling will make sure the fork networks with a deleted source
project are created.

That way we can join forks-of-forks into the same network even if
their original source was deleted.

Consider the following:

  `awesome-oss/badger` is forked to `coolstuff/badger`, which is
  forked to `user-a/badger` which in turn is forked to
  `user-b/badger`.

  When `awesome-oss/badger` is deleted, we will now create a fork
  network with `coolstuff/badger` as the root. The `user-a/badger`
  and `user-b/badger` projects will be added to the network.

Merge branch 'ee-38962-automatically-run-a-pipeline-when-auto-devops-is-turned-on-in-project-settings' into 'master'

Add checkbox to automatically run a pipeline when Auto DevOps is turned on in project settings -- EE merge edition

Closes gitlab-ce#38962

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

Added IDE commit panel

Closes #40041

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

Fix item name and namespace text overflow in Projects dropdown

Closes #39827

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

Fix viewing default push rules on a Geo secondary

Closes #4110

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

Reuse authors when rendering event Atom feeds

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

Port of CE branch '21143-customize-branch-name-when-using-create-branch-in-an-issue '

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

Resolve "Customize branch name when using create branch in an issue"

Closes #21143

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

Improve autosize spec

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

SSHUploadPack over Gitaly is now OptOut

Closes gitaly#730

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

Add border for epic edit button

Closes #3909

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

(to be consistent)

Backport - Add border for epic edit button

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

Backport epic tasklist

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

Fix tasklist for epics

Closes #4021

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

[EE] Add timeouts for Gitaly calls

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

Add timeouts for Gitaly calls

Closes gitaly#656

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

Use fuzzy search with minimum length of 3 characters where appropriate

Closes #40512

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

CE upstream

Closes omnibus-gitlab#2988 et gitlab-com/infrastructure#3260

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

Remove empty new-nav.scss

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

- Better gitaly-handling in /api/internal/allowed specs

initializes the branches dropdown upon invalid entry

Closes #40012

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

Fix star icon color/stroke

Closes #40638

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

I am certainly weary of debugging sidekiq but I don't think that's what was meant

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

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38962

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38962

Conflicts:
	app/services/projects/update_service.rb
	spec/services/projects/update_service_spec.rb