# Conflicts:
#   package.json

Upgrade to latest Version

DRYed the code

Changed new rules to warnings

Manual prettified and added stylelint rules

This reverts merge request !26380

Remove references to the vendored copies of At.js and jquery.carat
as well as the legacy rails wrapper gem.

* master:
  Fix cluster health charts
  Use gitlab-ci job name in environment dropdown
  Moved all emojis to the public folder
  Add Dependency Scanning vendored template for EE
  Added a condition on squash message display
  Improve files_decorator performance
  Move empty_repo check on its own
  Disable gitlab:ui:visual for documentation changes
  Allow protected branch creation for empty project
  Change 11.9 for 11.7 in include external files
  Add performance, dast, and review jobs to tags pipeline
  Update documentation
  Add build for tags
  fix group without owner after transfer

Render both usage and capacity in chart

With https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25597 we
also removed the babel-plugin-dynamic-import-node. It is now throwing
errors when we run jest with coverage.

This reverts commit 34293b5a, reversing
changes made to fdcfae2a.

Conflicts:
	.gitlab-ci.yml

Improves stylelint output by re-printing
failures after all warnings. This makes
it a lot easier to find failures.

This removes other outdated babel@6 dependencies as well.

Unfortunately the newer version of vue-jest has a dependency of an older
version of ts-jest. In order to satisfy the peerDependency from ts-jest,
we are forcing the version@24. The only "breaking" change from ts-jest
23->24 is that it requires a newer version of jest. This might be
obsolete soon, as vue-jest plans on switching to babel eventually.

Added stylelint to static-analysis
Updated yarn dependencies
CSS Fixes and rule adoptions of stylelint
Added stylelint-scss
Deduplicated yarn.lock to clear dependencies

Use gitlab-svg to provide the icons for rails, spring and express. For
the new GitLab pages templates, we are falling back to the GitLab logo.

- Use JS regex for emoji validation
- Add test for blocking emojis in full name
- Fix existing tests for user status that failed locally

v2.1.0 was published wrongly by the package author.