Merge branch 'master' into fl-update-gitlab-ui

* 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
This commit is contained in:
Filipa Lacerda 2019-03-07 10:36:44 +00:00 committed by Phil Hughes
parent 3781cbe0c3
commit 13c5f79656
2 changed files with 5 additions and 5 deletions

View file

@ -30,7 +30,7 @@
"@babel/preset-env": "^7.3.1", "@babel/preset-env": "^7.3.1",
"@gitlab/csslab": "^1.8.0", "@gitlab/csslab": "^1.8.0",
"@gitlab/svgs": "^1.54.0", "@gitlab/svgs": "^1.54.0",
"@gitlab/ui": "^2.2.1", "@gitlab/ui": "^2.2.2",
"apollo-boost": "^0.3.1", "apollo-boost": "^0.3.1",
"apollo-client": "^2.5.1", "apollo-client": "^2.5.1",
"autosize": "^4.0.0", "autosize": "^4.0.0",

View file

@ -663,10 +663,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.54.0.tgz#00320e845efd46716042cde0c348b990d4908daf" resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.54.0.tgz#00320e845efd46716042cde0c348b990d4908daf"
integrity sha512-DR17iy8TM5IbXEacqiDP0p8SuC/J8EL+98xbfVz5BKvRsPHpeZJQNlBF/petIV5d+KWM5A9v3GZTY7uMU7z/JQ== integrity sha512-DR17iy8TM5IbXEacqiDP0p8SuC/J8EL+98xbfVz5BKvRsPHpeZJQNlBF/petIV5d+KWM5A9v3GZTY7uMU7z/JQ==
"@gitlab/ui@^2.2.1": "@gitlab/ui@^2.2.2":
version "2.2.1" version "2.2.2"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-2.2.1.tgz#4b4f5c9234279a2ebeafc337c58eb6460aef963b" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-2.2.2.tgz#de8f436d6b52c168c4752b221a88cf7665fe0134"
integrity sha512-hxgZi1KRwd8EmVs1OeE/zcVH3GCE523GK4JWrTD8x9xPRS0O+NSIvbgqGBXp25UiG7jei9Up0X9BzZMTmZimug== integrity sha512-xVY8lGfDA3D2EtyfZVpJVeNUXLbpn/xJqNF4fleqHJfqrwt+IcVlsQ7yEs/LBukmIw6tXPliD4Mm9uefnQhkXA==
dependencies: dependencies:
"@babel/standalone" "^7.0.0" "@babel/standalone" "^7.0.0"
bootstrap-vue "^2.0.0-rc.11" bootstrap-vue "^2.0.0-rc.11"