# Conflicts:
#	package.json
#	spec/support/features/reportable_note_shared_examples.rb

Resolve "Deleting of a GitLab Pages project results in "`PagesWorker.perform_in` cannot be called inside a transaction""

Closes #35072

See merge request !13631

Fix project import to group when there are project milestones

Closes #35580

See merge request !13482

expose Referable#non_referable_inspect

See merge request !13613

Fix project templates and add docs

Closes #36492

See merge request !13563

Fixed collapsed sidebar not showing fly-out menu

See merge request !13622

Upgrade grape to 1.0

Closes #36588

See merge request !13609

Fix help page version image spec

Closes #36592

See merge request !13605

Fix milestone sidebar collapse button

Closes #36453

See merge request !13620

The link pointed to the wrong page, this is corrected by both writing
the documentation and linking to that instead.

(internal)
Reference: https://gitlab.slack.com/archives/C0NFPSFA8/p1502791719000238

The params were not getting a value other than `project_templates:"on"`
so the backend wasn't sure what template to use.

Fixes gitlab-org/gitlab-ce#36492

Add reserved names to docs

See merge request !13583

Main feature was the deprication of the Hashie stuff, so the access by
calling keys as method is gone now.

Only create commit GPG signature when necessary

See merge request !13561

Change 'This issue is not confidential' to 'Not confidential'

See merge request !13607

Repo editor with flex layout

See merge request !13571

Fix commit list request appending 40 to offset

Closes #36569 and #36563

See merge request !13603

Use charlock_holmes 0.7.5

See merge request !13602

Add more database development related docs

See merge request !13466

Fixes icon sidebar expanding causing a jump in padding

Closes #36456

See merge request !13568

Closes #36569

Comma separated values really are a form of serialised data so we should
clarify that we shouldn't store such data in the DB.

Merge branch '36442-images-in-issue-descriptions-no-longer-scale-to-the-width-of-their-container' into 'master'

Resolve "Images in issue descriptions no longer scale to the width of their container"

Closes #36442

See merge request !13586