* master: (96 commits)
  Fetch the merged branches at once
  Merging EE doc into CE
  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"
  ...

Update docs on creating MRs

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

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

Cache commits on the repository model

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

Avoid using Rugged in Gitlab::Git::Wiki#preview_slug

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

Add configurable option to display username in user avatar link component

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

Sanitize k8s default_namespace

Closes #38692

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

Revert "Merge branch '36670-remove-edit-form' into 'master'"

Closes #39441

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

Change default disabled merge request widget message to be more general

Closes #39188

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

Now, when requesting a commit from the Repository model, the results are
not cached. This means we're fetching the same commit by oid multiple times
during the same request. To prevent us from doing this, we now cache
results. Caching is done only based on object id (aka SHA).

Given we cache on the Repository model, results are scoped to the
associated project, eventhough the change of two repositories having the
same oids for different commits is small.

Semi-linear history merge is now available in CE.

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

Remove groups_select from global namespace & simplifies the code

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

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

Already mentioned in the list above this one.

Fix bitbucket login

Closes #39495

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

Fix broken table of content links

Closes #39471

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

This reverts commit 915e35a2, reversing
changes made to 9533786f.

Clarify the language around External Group membership with SAML SSO to clarify…

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

Likely caused by EE conflicts resolution