Conflicts:
	spec/javascripts/environments/environment_actions_spec.js

Make the 'Accepting merge requests' workflow consistent

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

Fix/update prettier script

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

Extract JobContainerItem component

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

Backport rescue in Project#import_url from EE

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

[QA] Port recent changes from EE

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

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

docs-Update proofreader.md

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

Update repository mirroring documentation to reflect current state.

Closes gitlab-ee#4302

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

EE added a `rescue` to the method Project#import_url, which could cause
merge conflicts when changing this method. This commit backports those
changes to CE, reducing the chances of running into a merge conflict.

Teach Danger how to pick up renamed files

Closes #52783

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

docs-Update index.md

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

docs-Update CONTRIBUTING.md

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

Update Guide for Microsoft Teams Notification Integration

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

Improve HelmClient and KubernetesClient

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

[CE backport] QA: Use strings for context descriptions

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

QA: Log page actions

Closes gitlab-qa#142

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

Fixed source projects not filtering

Closes #52728

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

Move shared examples into the only file where used (Clusters::CreateService spec)

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

Update test-scala-application.md to use sbtVersion instead of sbt-version

Closes #52957

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

Filtering source projects in the merge request creation form
would show a flash error because it is trying to filter remotely
to an undefined URL.

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

Danger apparently has three different objects which could contain files
you often want to check:

 - git.added_files
 - git.modified_files
 - git.renamed_files

The problem: If a file is renamed, `modified_files` contains the file
path before the rename. In some Danger checks we use `added_files` +
`modified_files`, which might contain the deleted paths of renamed
files, but missing the new paths of renamed files.

So we need to consider `renamed_files` as well.

Drop allow overflow option duration in numbers

Closes #52284

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

Improve specs for Ci::ProcessBuildService

Closes #52279

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

Add Applications API endpoints for listing and deleting entries.

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

See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22296

Frontend: Review app changes

Closes #33418

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

Remove base64 encoding from files that contain plain text

Closes #48746

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

Remove window scroll in features/project/job_spec

Closes #52690

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

Add RAW file format which is used to store security reports

Closes gitlab-ee#7996

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

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

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

Rails5: fix delete blob

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