* ee/master: (227 commits)
  Docs: move article "Autoscaling Runners on AWS" to its topic-related dir
  Don't run Geo specs in non-Geo jobs
  Gracefully handle case when no shard data is available
  Replace CI with CI/CD
  Update clair-scanner to v8
  Refactor Docker SAST docs
  Rename SAST Docker docs
  Add user docs for sast:image feature
  Add sast:image section to autodevops docs
  Update documentation for sast:image feature
  Add sast image documentation to CI examples
  Docs: remove duplicate CI examples
  Fix Geo::RenameRepositoryService spec when repo is already on disk
  remove app/assets/javascripts/dispatcher.js.rej
  Add EE specific spec fixes
  Generalize protected branch/tag dropdowns
  Add chaneglog entry
  Add test for neutralCount
  Fix neutral count computation
  Merge branch 'mk-fix-api-geo-spec' into 'master'
  ...

Don't run Geo specs in non-Geo jobs, and create a new job to run Geo specs without FDW

Closes #4403

See merge request gitlab-org/gitlab-ee!4021

Generalize protected branch/tag dropdowns

See merge request gitlab-org/gitlab-ee!4043

Gracefully handle case when no shard data is available

See merge request gitlab-org/gitlab-ee!4051

Docs: move article "Autoscaling Runners on AWS" to its topic-related dir

See merge request gitlab-org/gitlab-ee!4006

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

CE upstream - Thursday

Closes #4511, #4552, gitlab-qa#58, gitaly#793, gitlab-ce#41137, and gitlab-ce#41491

See merge request gitlab-org/gitlab-ee!4023

It's possible that if the GeoNodeStatus fails to fetch, we might end
up with a state where the primary loads the last known state without
any shard information. In this case, we should just report "UNKNOWN"
for the storage configuration match check.

Relates to #4586

Documentation for Docker image security scanning feature

Closes #4358

See merge request gitlab-org/gitlab-ee!3781

https://gitlab.com/gitlab-org/gl-sast/merge_requests/30

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Docs: remove duplicate CI examples

See merge request gitlab-org/gitlab-ee!4008

Fix neutralCount computation to prevent negative values

Closes #4582

See merge request gitlab-org/gitlab-ee!4044

with StrongMemoize

Update the grpc gem to 1.8.3

See merge request gitlab-org/gitlab-ee!4022

Refactor dispatcher project branches path (EE)

See merge request gitlab-org/gitlab-ee!4027

Refactor dispatcher projects blame and blob path (EE Version)

See merge request gitlab-org/gitlab-ee!4009

* ee/master: (25 commits)
  Fix api Geo spec
  Handle node details load failure gracefully on UI
  Docs: move article "installing Git"  to its topic-related dir
  Docs: move article "Laravel and Envoy w/ CI/CD"
  Epic issues API link
  Update CHANGELOG.md for 10.1.6
  Update CHANGELOG-EE.md for 10.1.6-ee
  Auto-correct Cop/LineBreakAroundConditionalBlock violations from rebase
  Update CHANGELOG.md for 10.2.6
  Update CHANGELOG-EE.md for 10.2.6-ee
  Added tests for removing soft removed objects
  Updated EE spec for soft removals
  Remove soft removals related code
  Fixes begin false positive
  Adds Rubocop rule for line break around conditionals
  ee-patch for refactor of help and profiles in dispatcher.js
  EE port of main-js-tidy-up
  Applied patch for projects-dispatcher-refactor
  Refactor dispatcher project boards path
  Update CHANGELOG.md for 10.3.4
  ...

Remove duplicate ee code

This was generalized for usage in the new variable table design, see
https://gitlab.com/gitlab-org/gitlab-ce/issues/39118#note_53615249

Fix api Geo spec

See merge request gitlab-org/gitlab-ee!4035

(cherry picked from commit a9521a83)

fa48635f Fix api Geo spec