Conflicts:
	app/assets/stylesheets/framework/blank.scss
	app/views/dashboard/projects/_zero_authorized_projects.html.haml
	spec/factories/licenses.rb

Add missing changelog for adding warning when rebuilding authorized_keys with writes disabled

See merge request !2535

Fix "Rebasing not working with Merge Requests"

Closes #2979

See merge request !2531

Geo - Extract a base scheduler worker

See merge request !2425

Ee 29289 project destroy clean up after failure

See merge request !2473

Fixes 500 error caused by pending delete projects in admin dashboard

See merge request !2518

Update PG HA to be Beta instead of Experimental

See merge request !2522

Renamed board to boards in new navigation project sidebar

Closes #3015

See merge request !2526

1. Rescue all errors that `Projects::DestroyService` might throw, to prevent the
   worker from leaving things in an inconsistent state

2. Unmark the project as `pending_delete`

3. Add a `delete_error` text column to `projects`, and save the error message in
   there, to be shown to the project masters/owners.

Bumps Gitlab Omniauth LDAP version

See merge request !2515

Closes #3015

Backports gitlab-ce!10491

See merge request !2501

Docs: add overview and use cases for Jenkins integration

Closes #3012

See merge request !2524

Update the mirror delay to something that's valid in controller spec

See merge request !2520

Fixes alignments and strokes in mini graph for pipeline

Closes #2971

See merge request !2506

[ci skip]

[ci skip]

Fixed issue boards focus mode when new navigation is turned on

Closes gitlab-ce#35449

See merge request !2502