# Conflicts:
#	app/controllers/concerns/notes_actions.rb
#	spec/features/task_lists_spec.rb
#	spec/support/features/issuable_slash_commands_shared_examples.rb

Fix relative_url_root support for webpack chunks

Closes #35567

See merge request !13165

Update documentation of user creation by replacing the 'confirm' param with 'skip_confirmation'

Closes #35614

See merge request !13160

Add a note about EFS and GitLab log files

See merge request !13180

[ci skip]

[ci skip] Fix emoji 100 bug: Creating strucutre to a forEach and then using Object.keys was causing a type inconsistency

Projects logo are not centered vertically on projects page

Closes #35044, #31753, and #35546

See merge request !13124

Ensure Gitlab.config.gitlab.host/port and Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs

Closes #35599

See merge request !13126

Fix spec/features/projects/branches_spec

See merge request !13163

Add copy about search terms to ux guide

See merge request !10267

Add link to JIRA article in docs

Closes #35046

See merge request !13154

Explain all possible values of 'only' and 'except'

Closes #34119

See merge request !13138

Load and process at most 100 commits when pushing into default branch

Closes #35531

See merge request !13132

Fix replying to commit comments on merge requests created from forks

Closes #31772

See merge request !13137

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8666

Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_id

See merge request !12673

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

Merge branch '35695-comment-appears-in-a-wrong-place-after-changing-diff-view-to-inline' into 'master'

Resolve "Comment appears in a wrong place after changing diff view to inline"

Closes #35695

See merge request !13156

This makes the default sort order for branches 'recently updated' rather than by name.

Closes #26890

See merge request !8666

A commit comment shows in the MR, but if the MR is from a fork, it will have a
different project ID to the MR's target project. In that case, add an
note_project_id param so that we can pick the correct project for the note.

Fix 500 error when rendering avatar for deleted project creator

See merge request !13110

Merge issuable "reopened" state into "opened"

See merge request !12972

added article from techbeacon on CI

See merge request !10452

Update gitlab_flow.md, Teatro seems to be completely dead, see also…

See merge request !13157

Log web hook execution timeout events

See merge request !13134