# Conflicts:
#	app/assets/stylesheets/pages/groups.scss
#	app/models/group.rb
#	config/database.yml.postgresql
#	config/routes/group.rb
#	db/schema.rb
#	doc/api/settings.md
#	locale/gitlab.pot
#	scripts/prepare_build.sh

[ci skip]

Improve database yml examples

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

host is omitted by default

Refactored multi-file data structure

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

Add inline edit button to issue_show app

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

Change project deletion message from alert to notice

Closes #26956

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

Merge branch '20930-very-first-commit-to-default-branch-didn-t-close-referenced-issue' into 'master'

Fix #20930: automatic closing is not triggered on very first push.

Closes #20930

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

Move user avatar specs to folder to mimic javascript directory

Closes #39169

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

Improve sprite icon spec

Closes #39199

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

Avoid using `Redis#keys`

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

Fix errors when deleting a forked project

Closes #39196

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

Use variable for mobile breadcrumbs padding

Closes #38156

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

The problem would occur when the `ForkedProjectLink` was deleted, but
the `ForkNetworkMember` was not. The delete would be rolled back and
retried.

But the error would not be saved because `Project#forked?`
would still be true, because the `ForkNetworkMember` exists. But the
`Project#forked_project_link` would be `nil`. So the validation for
the visibility level would fail.

Prevent creating multiple ApplicationSetting by forcing it to always have id=1

Closes #34728

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

Merge branch '39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclass' into 'master'

Resolve "Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits::Error: #<NoMethodError: undefined method `map' for nil:NilClass"

Closes #39181

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

Adds collapsible sections in cluster page

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

CE upstream

Closes #2709, gitaly#654, and gitlab-ce#36417

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

This is already handled for diffs, but not commits.

Allow testing on Gitaly call count

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

Clarify how to resume GitHub import on docs

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

Bump Git version to 2.13.6

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

Make the circuitbreaker configurable at runtime

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

CE upstream: Friday

Closes gitaly#586, gitlab-ce#38871, and gitaly#629

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

Adds a test for flattenedFiles
Changes the data method to not be an arrow method
Various other review fixes

Show collapsible tree on the project show page

Closes #30343

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

Make the maximum capacity of Geo backfill operations configurable

Closes #3532

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

Instead of from the configuration file