(cherry picked from commit da3cd00f5a31f762eb67c2824233ad2b275b2ba8)

Conflicts:
	config/webpack.config.js

Support bamboo api polymorphism

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

CE: Resolve "Extract EE specific files/lines for some project CI views"

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

Add OpenTracing instrumentation for Action View Render events

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

Docs: Releases permissions

Closes #56471

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

This change adds three new instrumentations, driven through rails
notifications: render_template.action_view,
render_collection.action_view and render_partial.action_view.

These can help developers understand why renders are taking a long
time which may in turn help them to improve their performance.

Fix Bitbucket Server import not allowing personal projects

Closes #53419

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

Make supported bundler version clearer and polish topic

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

Rename issue template from "Add style" to "Coding style"

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

Documentation now matches UI copy

Closes #56783

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

Re-enable MethodCallWithoutArgsParentheses Cop

Closes #56795

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

Surface link to auth section index

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

Merge branch '25569-changing-wording-to-delete-when-referring-to-removing-a-branch--docs' into 'master'

Change `remove branch` to `delete branch`

Closes #25569

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

It may return single result or an array of results

Fix failed LDAP logins when nil user_id present

Closes #56734

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

Resolve "Pipeline stages job action button icon is not aligned"

Closes #56379

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

Resolve "Redesign group overview UI: MVC"

Closes #53104

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

Because there were a few people thought that's for UI styling...

Convert noteable_discussion_spec.js to Vue test utils

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

Quarantine auto devops QA tests

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

Added missing parameter cluster_id in the params list for edit project cluster endpoint

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

Docs: Minor fix to formatting

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

Add script to remove all subgroups within a provided group

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

Revert the "What's new" feature

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

Overrides commonName Helm chart value

Closes #55820

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

When a LDAP user signs in the for the first time and if there
is an `Identity` object with `user_id` of `nil`, new users
will not be able to be register until that entry is cleared
because of the way identities are created:

1. First, the User object is built but not saved, so it has no `id`.
2. Then, `user.identities.build(provider: 'ldapmain')` is called,
   but it does not have an associated `user_id` as a result.
3. `User#save` is called, but the `Identity` validation fails if an
   existing entry with `user_id` of `nil` already exists.

The uniqueness validation for `nil` values doesn't make any sense in
this case. We should be enforcing this at the database level with a
foreign key constraint. To work around the issue we can validate
against the user instead, which does the right thing even when
the user isn't saved yet.

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

Re-enables and autocorrects all instances of the
Style/MethodCallWithoutArgsParentheses rule

Port EE style for lib/gitlab/metrics/influx_db.rb

Closes gitlab-ee#6526

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

Reduce amount of locks needed for GitHub importer

Closes #54270 and #51817

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