We wanted to check that the text could be encoded as JSON, because
conflict resolutions are passed back and forth in that format, so the
file itself must be UTF-8. However, all strings from the repository come
back without an encoding from Rugged, making them ASCII_8BIT.

We force to UTF-8, and reject if it's invalid. This still leaves the
problem of a file that 'looks like' UTF-8 (contains valid UTF-8 byte
sequences), but isn't. However:

1. If the conflicts contain the problem bytes, the user will see that
   the file isn't displayed correctly.
2. If the problem bytes are outside of the conflict area, then we will
   write back the same bytes when we resolve the conflicts, even though
   we though the encoding was UTF-8.

Take nonewline context into account in diff parser

Closes #28128 and #22636

See merge request !9705

Improve fragment caching rules at projects dashboard

Closes #28364

See merge request !9895

Expand the changelog documentation

See merge request !9774

Patch 15

Closes #29361

See merge request !9922

Add count badges to both dashboard and group milestones

Closes #24421

See merge request !9836

Update markdown.md example with asterisks and underscores for clarity

See merge request !9915

Fix miswording

See merge request !9832

Fix 'ExecJS disabled' error on issues index

Closes #28743

See merge request !9916

Fix regression in runners registration v1 api

See merge request !9904

Use a button and a post request instead of UJS links - part 1 - Environments

See merge request !9688

Occurred in production when an issue had an associated MR

Fix missing blob line permalink updater on blob:show

See merge request !9914

See
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9461#note_25288831

Remove IIFEs for several JS files - Part 1

See merge request !9884

Organize our polyfills and standardize on core-js

See merge request !9749

Do not show LFS object when LFS is disabled

Closes #28817

See merge request !9779

Adds docs for QueryRecorder tests

Closes #28492

See merge request !9838

Display error message when deleting tag in web UI fails

See merge request !9906

Update permalink/blame buttons with line number fragment hash

Closes #19742

See merge request !9461

Adds examples of what should and should not get a changelog entry, and
examples of good and bad entries.

[ci skip]

Create a new issue for a single discussion

See merge request !8266

Implement `json_response` as a `let` variable

Closes #29242

See merge request !9825

Do not display a 404, when a user tries to retrieve the raw content of
an LFS file (pointer) if the config option "lfs_enabled" is set to
false. Instead, display the LFS pointer file directly.

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

New file from interface on existing branch

Closes #24501

See merge request !8427

Signed-off-by: Rémy Coutable <remy@rymai.me>

This is not a good idea to memoize `json_response` using an instance
variable because `rspec-retry` doesn't clear instance variables on
retries, only `let` variables.

This will avoid issues where retries would fail on a different line that
the original failure, blurrying what's the real failure.

Also, automatically add api: true to specs under
/spec/requests/(ci/)?api/, and include JsonHelpers in controller, request
and API specs.
Signed-off-by: Rémy Coutable <remy@rymai.me>

Add the generated license.csv for 9.0

See merge request !9826

Blacklist nested groups and project names that can cause ambiguous routing for HA

Closes #29324

See merge request !9898