* upstream/master: (621 commits)
  Add a note about GitLab QA page objects validator to docs
  Refactor dispatcher projects blame and blob path
  Update export message to mention we can download the file from the UI
  Fix Ctrl+Enter keyboard shortcut saving comment/note edit
  fix case where tooltip messes up :last-child selector
  Add reason to keep postgresql 9.2 for CI
  Remove warning noise in ProjectImportOptions
  Add changelog entry
  Add RedirectRoute factory
  Update Ingress extra cost note to be more generic
  Fix Rubocop offense
  Refactor dispatcher project branches path
  Revert "Revert "Fix Route validation for unchanged path""
  Document that we need rsync for backing up
  Docs: move article "Laravel and Envoy w/ CI/CD"
  Recommend against the use of EFS
  Adds Rubocop rule for line break around conditionals
  Update CHANGELOG.md for 10.1.6
  Filter out build traces from logged parameters
  Refactored project:n* imports in dispatcher.js
  ...

Update the grpc gem to 1.8.3

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

Add a note about GitLab QA page objects validator to docs

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

Fix Ctrl+Enter keyboard shortcut saving comment/note edit

Closes #41956

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

Refactor dispatcher project branches path

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

Refactor dispatcher projects blame and blob path

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

Update export message to mention we can download the file from the UI

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

Resolve "Attachments in e-mail notifications are using the wrong URL"

Closes #41882

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

Fix Route validation when conflicting permanent redirects exist

Closes gitlab-com/support-forum#2883 and #41786

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

Resolve "Subscribe button tooltip on issues page causes visual stuttering"

Closes #37077

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

Add reason to keep postgresql 9.2 for CI

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

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41956

Migrate rebase_in_progress? to Gitaly

Closes gitaly#866

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

Migrate Gitlab::Git::Repository#rebase to Gitaly

Closes gitaly#863

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

Remove warning noise in ProjectImportOptions

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

Refactor dispatcher dashboard mr path

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

Squlches these warnings:

```
/opt/gitlab/embedded/service/gitlab-rails/app/workers/concerns/project_import_options.rb:5: warning: already initialized constant ProjectImportOptions::IMPORT_RETRY_COUNT
/opt/gitlab/embedded/service/gitlab-rails/app/workers/concerns/project_import_options.rb:5: warning: previous definition of IMPORT_RETRY_COUNT was here
```

Refactor dispatcher project boards path

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

Improve wording about additional costs with Ingress on GKE or custom clusters

Closes #41163

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

Fix padding for pipeline dropdowns after bad merge

Closes #41221

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

Tidy up main JS file

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

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41163

Resolve "Document rsync as requirement for 10.4"

Closes #41607

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

This reverts commit 3576d59a.

Docs: move article "Laravel and Envoy w/ CI/CD"

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

Docs: move GitLab/Openshift article to its topic-related dir

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

Port gitlab-ee MR 3981 to CE

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