# Conflicts:
#   doc/user/discussions/index.md

Bring back Rugged implementation of TreeEntry

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

Add jest to frontend_testing docs

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

Update packages comment in gitlab.yml.example [ci skip]

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

[CE] Extract EE specific code for spec/support

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

Bring back Rugged implementation of GetTreeEntries

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

Project whitelist for JupyterHub deployment

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

Merge branch 'restrict-jupyter-login' of https://gitlab.com/amit1rrr/gitlab-ce into restrict-jupyter-login

Revert "Merge branch 'id-1951-filter-merge-requests-by-approvers' into 'master'"

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

This reverts merge request !24982

Port translations from EE

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

Fixed the blob editor deleting all content for files

Closes #58578

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

Update Cycle Analytics Documentation

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

Fix Sidekiq process group killing

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

Edit Knative domain after it has been deployed

Closes #56937

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

Fix missing quote in Wildcard domains section

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

This only happens for files that the path consists of only numbers

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58578

Enable reply_to_individual_notes feature flag by default

Closes #30299

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

This brings back some of the changes in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20099/diffs

For users using Gitaly on top of NFS, accessing the Git data directly
via Rugged is more performant than Gitaly. This merge request introduces
the feature flag `rugged_tree_entry` to activate the Rugged method.

Part of four Rugged changes identified in
https://gitlab.com/gitlab-org/gitlab-ce/issues/57317.

This brings back some of the changes in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20343.

For users using Gitaly on top of NFS, accessing the Git data directly
via Rugged is more performant than Gitaly. This merge request introduces
the feature flag `rugged_tree_entries` to activate the Rugged method.

Part of four Rugged changes identified in
https://gitlab.com/gitlab-org/gitlab-ce/issues/57317.

Resolve "Jobs tab border top in pipeline's page is 1px off"

Closes #47869

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

Docs: use Pages project templates as default getting started

Closes #58033

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

- Move instructions to use project templates to getting started
- Move the fork illustration into the in-depth guide
- Add screenshot for current project templates

Copyedit - better wording

Copy edit - typo

Bring back Rugged implementation of CommitIsAncestor

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

Profiler only works with absolute URLs and paths

Closes #43388

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

Expand diff to entire file

Closes #19054

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

Make merge to refs/merge-requests/:iid/merge not raise when FF-only enabled

Closes #58393

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

Update activity filter for issues

Closes #53334

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

Upgrade GITALY_SERVER_VERSION for v1.25.0

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