* upstream/master: (466 commits)
  Set initial password for instance in LDAP QA test
  Backport EE changes to some hashed storage documentation to CE
  Remove allow_n_plus_1 from Git::Repository#branches_filter
  Bumps Gitlab Shell version to 6.0.3
  Make resetting column information overridable in EE
  Added 'clear' button to ci lint editor
  Issues and merge requests in subgroups docs
  Update docs labels CE
  Refactored merge_requests/show path in dispatcher.js
  wording
  don't check against a hardcoded user name
  10.5 Update the dependencies license list
  10.5 Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates
  Create update guide for 10.5
  Update 10.5 source install guide
  Add docs for MR link in commit page
  Add groups to OpenID Connect claims
  Replaced $.get with axois.get
  Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitaly
  Update style_guide_scss.md
  ...

Set initial password for instance in LDAP QA test

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

Resolve "Hashed storage is now beta"

Closes #42896

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

For a new instance, the root password needs to be set, regardless of whether
LDAP is enabled.

Remove allow_n_plus_1 from Git::Repository#branches_filter

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

Use hashed storage in the specs

Closes #40744

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

Make resetting column information overridable in EE

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

Bumps Gitlab Shell version to 6.0.3

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

Added 'clear' button to ci lint editor

Closes #26598 and #41209

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

Add docs for MR link in commit page

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

Resolve 10.5.0 RC1 QA Failure with failing API specs

Closes gitlab-qa#180

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

Issues and merge requests in subgroups docs

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

Update docs labels CE

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

10.5 Update the dependencies license list

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

Replaced $.get with axois.get

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

Docs: bring important info from blog post to doc

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

Add groups to OpenID Connect claims

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

Refactored merge_requests/show path in dispatcher.js

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

10.5 Update the `.gitignore`, `.gitlab-ci.yml`, and `Dockerfile` templates

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

10.5 Create the "Update" guides

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

10.5 Update the "Installation from Source" guide

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

and use an invalid user name that is random so we know it's invalid

Add blurb about changing MRs to WIP through commits

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

Add a note about merge conflicts in `gitlab.pot`

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