* master: (21 commits)
  GitLab QA: Add GITLAB_USER_TYPE to support different login types (e.g. standard, LDAP)
  Return a warning string if we try to encode to unsupported encoding
  Remove confirmation_input
  Resolve failures in GitHub-ish import controller specs
  Remove changelogs for already-released security patches
  Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4'
  Merge branch 'fix/gh-namespace-issue' into 'security-10-4'
  Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into 'security-10-4'
  Merge branch 'fix-mermaid-xss' into 'security-10-4'
  Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4'
  API - fix searching in group/project specified by path
  Add documentation on how to build a QA Docker image
  Fix english in style_guide_js.md
  Adds tooltip for environment name Adds CSS for child envrionments
  Do not attach runner to a non-exsiting network in QA
  Remove not needed default statement
  Improve docs about allowing some side effects on the constructor
  Move all ENV to Runtime::Env
  Rename .scss files to use snake_case
  Moves missing branch into a vue file
  ...

GitLab QA: Add GITLAB_USER_TYPE to support different login types (e.g. standard, LDAP)

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

Resolve "Add tooltip in enviroments names"

Closes #42922

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

Rename .scss files to use snake_case

Closes #42908

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

API - fix searching in group/project specified by path

Closes #42937

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

GITLAB_USERNAME and GITLAB_PASSWORD may be specified for an LDAP login, but QA
scenarios may need to know which type it is in order to log in successfully.

Return a warning string if we try to encode to unsupported encoding

Closes gitlab-development-kit#321

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

Remove confirmation_input component

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

Fixes gitlab-development-kit#321

Pick 10.4.3 fixes into master

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

Fix using wildcards in protected tags to expose protected variables

[10.4] Fix GH namespace security issue

Restrict Todo API mark_as_done endpoint to the user's todos only

[10.4] Fix stored XSS in code blocks

Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4'

[Port for security-10-4]: Makes SnippetFinder ensure feature visibility

Improve docs about allowing some side effects on the constructor

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

Add documentation on how to build a QA Docker image

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

Do not attach runner to a non-exsiting network in QA

Closes gitlab-qa#180

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

Allow using a different sandbox group for QA

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

Moves missing branch into a vue file

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

Adds CSS for child envrionments

Replace $.post in importer status with axios

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

Update vue component naming guidelines

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

* upstream/master: (27 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
  [docs] Info rescheduling background migrations
  ...

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.