receive data on when there is a conflict

This reverts merge request !24485

fix display comment avatars issue in IE 11

Closes #56931

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

Create security release MR template

Closes gitlab-org/release/framework#168, gitlab-org/release/framework#166, and gitlab-org/release/framework#167

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

Pass build variables downstream / CE port

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

Fix cluster installation processing spinner

Closes #56398

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

Pass $CI_COMMIT_TAG as GITLAB_TAG to the CNG triggered pipelines

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

Expose app version to frontend

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

Prefer to use overrides on PipelinesController

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

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...