CE Upstream - Monday

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

This reverts merge request !15009
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

This reverts commit 3c7eebdd.

This reverts commit 60f8ee06.

Geo: read-only safeguards was not working on Secondary node

Closes #3876

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

Fix LDAP group sync for nested groups

Closes #3854

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

Fix minor TYPOs in Geo docs

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

The member DNs are already normalized, so we only need to normalize the configured base string.

Merge branch 'pawel/bump_prometheus_gem_to_fix_read_all_values_returning_bad_data-39504' into 'master'

Update Prometheus Gem to fix problem caused by using wrong data offsets

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

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

Fix broken Members link when relative URL root paths are used

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

Navigating to the "Members" section of a project would omit the
relative URL root path. Fix the redirection and eliminate the
need for a redirection in the first place.

Related Rails issue discussing omitting the leading slash in the
redirect paths: https://github.com/rails/rails/issues/21193

Fix other redirections failing to work with relative roots.

Ee 38869 importer status - Remove code from global namespace

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

Geo: database-backed SSH key lookups are mandatory

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

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

[CE backport] Saved configuration for issue board

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

Use the correct project visibility in system hooks

Closes #39496

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

grab the correct username when confirming secondary email

Closes #39366

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

Remove Autosave class from global namespace

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

CE upstream: Friday

Closes gitlab-ce#39188, gitaly#683, #3664, and gitlab-ce#39351

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

Update docs on creating MRs

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

EE: Fetch the merged branches at once

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

Fetch the merged branches at once.

Checking it one by one in the view. We don't cache this yet
because this would already much improve the performance.

A naive test against a particularly large repository:

``` ruby
begin
  now = Time.now
  branches.map{ |b| r.merged_to_root_ref?(b.name) }
  Time.now - now
end # 8.265830782
```

Around 10 times faster:

``` ruby
begin
  now = Time.now
  r.merged_branches(branches.map(&:name))
  Time.now - now
end # 0.807405397
```

This should make the branches page usable.

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

Move doc/development/ee_features.md to CE

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

Update EE docs to allow not having EE namespace

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

* upstream/master: (72 commits)
  Avoid using Rugged in Gitlab::Git::Wiki#preview_slug
  Cache commits on the repository model
  Remove groups_select from global namespace & simplifies the code
  Change default disabled merge request widget message to "Merge is not allowed yet"
  Semi-linear history merge is now available in CE.
  Remove repetitive karma spec
  Improve spec to check hidden component
  Rename to shouldShowUsername
  Add KubernetesService#default_namespace tests
  Revert "Merge branch '36670-remove-edit-form' into 'master'"
  Fix bitbucket login
  Remove duped tests
  Add path attribute to WikiFile class
  Make local_branches OPT_OUT
  Clarify the language around External Group membership with SAML SSO to clarify that this will NOT add users to GitLab Groups.
  Added ssh fingerprint, gitlab ci and pages information in an instance configuration page
  Fix the incorrect value being used to set GL_USERNAME on hooks
  Resolve "Remove overzealous tooltips in projects page tabs"
  Fix broken table of content links
  Remove filter icon from search bar
  ...

Geo: Ensure database is connected before attempting to check for secondary status

Closes #3074

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