[ci skip]

[ci skip]

Conflicts:
	db/schema.rb

* master: (1327 commits)
  Merge branch 'render-json-leak' into 'security'
  Merge branch 'ssrf' into 'security'
  Merge branch 'ssrf' into 'security'
  Merge branch 'fix-links-target-blank' into 'security'
  Merge branch '28058-hide-emails-in-atom-feeds' into 'security'
  Fix karma test
  Reset filters after click
  Handle Route#name being nil after an update
  Only add frontend code coverage instrumentation when generating coverage report
  fix recompile assets step in 9.0 upgrade guide to use yarn
  Undo explicit conversion to Integer
  Make level_value accept string integers
  Make feature spec more robust
  Removed d3.js from the main application.js bundle
  Extend compound status for manual actions specs
  Update css to be nice and tidy.
  Fix pipeline status for transition between stages
  add an index to the ghost column
  Return 404 in project issues API endpoint when project cannot be found
  Improve rename projects migration
  ...

Conflicts:
	doc/ci/docker/using_docker_build.md
	spec/lib/gitlab/import_export/all_models.yml

Return 404 in project issues API endpoint when project cannot be found

Closes #29631

See merge request !10093

Fix pipeline status for transition between stages

Closes #29699

See merge request !10094

Merge branch '29685-wrong-number-of-arguments-calling-http_url_to_repo-on-cloning-project-wikis' into 'master'

Fix ProjectWiki#http_url_to_repo signature

Closes #29685

See merge request !10079

Improve rename projects migration

Closes #29556

See merge request !10009

Fix Error 500 when application settings are saved

Closes #29674 and #29115

See merge request !10070

Add filter focus for filtered search visual tokens

See merge request !9875

add an index to the ghost column

See merge request !9910

Make the v3_to_v4.md more consistent

See merge request !10092

Remove useless options from db/fixtures/development/17_cycle_analytics.rb

Closes #29671

See merge request !10086

Fix bug when system hook for create deploy key

Closes #29175

See merge request !9796

Handle Route#name being nil after an update

Closes #29592

See merge request !10102

fix for render json include leaks

See merge request !2074

nil check for url_blocker?

See merge request !2076

Protect server against SSRF in project import URLs

See merge request !2068

Adds rel="noopener noreferrer" to all links with target="_blank"

See merge request !2071

Only show public emails in atom feeds

See merge request !2066

Resolve "9.0 upgrade documentation should include Yarn"

Closes #29730

See merge request !10101

Reset issue boards add issues modal page when filtering

Closes #29616

See merge request !10039

Align filtered search visual tokens with input field text

Closes #29167

See merge request !10095

Reset filters after click

Closes #28463

See merge request !10024

It was possible for the `routes.name` field to be `NULL`, causing
`name_was` to be `nil` after a rename, resulting a bad first argument to
`sub` when attempting to rename descendants. This change adds a
condition to make sure `name_was` is present before attempting the
descendant update.

fixes large text tooltip in diff file name

Closes #28499

See merge request !9529

dismissable error close is not visible enough

Closes #28660

See merge request !9516

handle commas in Issue total count

Closes #29559

See merge request !10028

Only add frontend code coverage instrumentation when generating coverage report

See merge request !9987