Merge branch 'master' into certmanager-temp

14 files changed, 191 insertions, 40 deletions

diff --git a/vendor/gitignore/Android.gitignore b/vendor/gitignore/Android.gitignore
index 39b6783cef8..69eda01429a 100644
--- a/vendor/gitignore/Android.gitignore
+++ b/vendor/gitignore/Android.gitignore
@@ -1,6 +1,7 @@
 # Built application files
 *.apk
 *.ap_
+*.aab
 
 # Files for the ART/Dalvik VM
 *.dex
@@ -43,8 +44,9 @@ captures/
 .idea/caches
 
 # Keystore files
-# Uncomment the following line if you do not want to check your keystore files in.
+# Uncomment the following lines if you do not want to check your keystore files in.
 #*.jks
+#*.keystore
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
diff --git a/vendor/gitignore/Delphi.gitignore b/vendor/gitignore/Delphi.gitignore
index 000ee5f104b..9532800ba22 100644
--- a/vendor/gitignore/Delphi.gitignore
+++ b/vendor/gitignore/Delphi.gitignore
@@ -64,3 +64,6 @@ __recovery/
 
 # Castalia statistics file (since XE7 Castalia is distributed with Delphi)
 *.stat
+
+# Boss dependency manager vendor folder https://github.com/HashLoad/boss
+modules/
diff --git a/vendor/gitignore/Elixir.gitignore b/vendor/gitignore/Elixir.gitignore
index 86e4c3f3905..b263cd10f37 100644
--- a/vendor/gitignore/Elixir.gitignore
+++ b/vendor/gitignore/Elixir.gitignore
@@ -7,3 +7,4 @@ erl_crash.dump
 *.ez
 *.beam
 /config/*.secret.exs
+.elixir_ls/
diff --git a/vendor/gitignore/Global/Images.gitignore b/vendor/gitignore/Global/Images.gitignore
new file mode 100644
index 00000000000..97dcdbe6a95
--- /dev/null
+++ b/vendor/gitignore/Global/Images.gitignore
@@ -0,0 +1,63 @@
+# JPEG
+*.jpg
+*.jpeg
+*.jpe
+*.jif
+*.jfif
+*.jfi
+
+# JPEG 2000
+*.jp2
+*.j2k
+*.jpf
+*.jpx
+*.jpm
+*.mj2
+
+# JPEG XR
+*.jxr
+*.hdp
+*.wdp
+
+# Graphics Interchange Format
+*.gif
+
+# RAW
+*.raw
+
+# Web P
+*.webp
+
+# Portable Network Graphics
+*.png
+
+# Animated Portable Network Graphics
+*.apng
+
+# Multiple-image Network Graphics
+*.mng
+
+# Tagged Image File Format
+*.tiff
+*.tif
+
+# Scalable Vector Graphics
+*.svg
+*.svgz
+
+# Portable Document Format
+*.pdf
+
+# X BitMap
+*.xbm
+
+# BMP
+*.bmp
+*.dib
+
+# ICO
+*.ico
+
+# 3D Images
+*.3dm
+*.max
diff --git a/vendor/gitignore/Global/NetBeans.gitignore b/vendor/gitignore/Global/NetBeans.gitignore
index 254108cd23b..863bc7fa66e 100644
--- a/vendor/gitignore/Global/NetBeans.gitignore
+++ b/vendor/gitignore/Global/NetBeans.gitignore
@@ -1,4 +1,4 @@
-nbproject/private/
+**/nbproject/private/
 build/
 nbbuild/
 dist/
diff --git a/vendor/gitignore/Global/PSoCCreator.gitignore b/vendor/gitignore/Global/PSoCCreator.gitignore
new file mode 100644
index 00000000000..15ae040bcda
--- /dev/null
+++ b/vendor/gitignore/Global/PSoCCreator.gitignore
@@ -0,0 +1,18 @@
+# Project Settings
+*.cywrk.*
+*.cyprj.*
+
+# Generated Assets and Resources
+Debug/
+Release/
+Export/
+*/codegentemp
+*/Generated_Source
+*_datasheet.pdf
+*_timing.html
+*.cycdx
+*.cyfit
+*.rpt
+*.svd
+*.log
+*.zip
diff --git a/vendor/gitignore/Global/Xcode.gitignore b/vendor/gitignore/Global/Xcode.gitignore
index cd0c7d3e45a..b01314d3a64 100644
--- a/vendor/gitignore/Global/Xcode.gitignore
+++ b/vendor/gitignore/Global/Xcode.gitignore
@@ -2,17 +2,11 @@
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
-## User settings
-xcuserdata/
-
-## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
-*.xcscmblueprint
-*.xccheckout
-
-## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
+## Build generated
 build/
 DerivedData/
-*.moved-aside
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -21,3 +15,65 @@ DerivedData/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+# Package.resolved
+.build/
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+#
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots/**/*.png
+fastlane/test_output
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
+
diff --git a/vendor/gitignore/Laravel.gitignore b/vendor/gitignore/Laravel.gitignore
index 67e2146f2bc..6552ddf8a06 100644
--- a/vendor/gitignore/Laravel.gitignore
+++ b/vendor/gitignore/Laravel.gitignore
@@ -1,4 +1,4 @@
-vendor/
+/vendor/
 node_modules/
 npm-debug.log
 yarn-error.log
diff --git a/vendor/gitignore/Magento.gitignore b/vendor/gitignore/Magento.gitignore
index 6f1fa223992..abe6d79fedb 100644
--- a/vendor/gitignore/Magento.gitignore
+++ b/vendor/gitignore/Magento.gitignore
@@ -2,6 +2,8 @@
 # Magento Default Files    #
 #--------------------------#
 
+/PATCH_*.sh
+
 /app/etc/local.xml
 
 /media/*
diff --git a/vendor/gitignore/Node.gitignore b/vendor/gitignore/Node.gitignore
index c221276ebae..e1da6ae8ea5 100644
--- a/vendor/gitignore/Node.gitignore
+++ b/vendor/gitignore/Node.gitignore
@@ -71,3 +71,6 @@ typings/
 
 # Serverless directories
 .serverless
+
+# FuseBox cache
+.fusebox/
diff --git a/vendor/gitignore/Python.gitignore b/vendor/gitignore/Python.gitignore
index 6f7a6d9c3d7..510c73d0fdb 100644
--- a/vendor/gitignore/Python.gitignore
+++ b/vendor/gitignore/Python.gitignore
@@ -109,3 +109,6 @@ venv.bak/
 .mypy_cache/
 .dmypy.json
 dmypy.json
+
+# Pyre type checker
+.pyre/
diff --git a/vendor/gitignore/Rails.gitignore b/vendor/gitignore/Rails.gitignore
index 78eb74fdc26..38ba1b5b38c 100644
--- a/vendor/gitignore/Rails.gitignore
+++ b/vendor/gitignore/Rails.gitignore
@@ -50,6 +50,7 @@ node_modules/
 # Ignore precompiled javascript packs
 /public/packs
 /public/packs-test
+/public/assets
 
 # Ignore yarn files
 /yarn-error.log
diff --git a/vendor/gitignore/Unity.gitignore b/vendor/gitignore/Unity.gitignore
index 0210746b1a5..833e6d4291c 100644
--- a/vendor/gitignore/Unity.gitignore
+++ b/vendor/gitignore/Unity.gitignore
@@ -23,6 +23,7 @@ ExportedObj/
 *.svd
 *.pdb
 *.opendb
+*.VC.db
 
 # Unity3D generated meta files
 *.pidb.meta
diff --git a/vendor/licenses.csv b/vendor/licenses.csv
index 9083fe076c3..ea3d3fd02f9 100644
--- a/vendor/licenses.csv
+++ b/vendor/licenses.csv
@@ -67,8 +67,9 @@
 @babel/template,7.1.2,MIT
 @babel/traverse,7.1.0,MIT
 @babel/types,7.1.2,MIT
-@gitlab-org/gitlab-svgs,1.31.0,MIT
-@gitlab-org/gitlab-ui,1.8.0,MIT
+@gitlab-org/gitlab-svgs,1.32.0,MIT
+@gitlab-org/gitlab-ui,1.10.0,MIT
+@gitlab/svgs,1.35.0,MIT
 @sindresorhus/is,0.7.0,MIT
 @types/jquery,2.0.48,MIT
 @vue/component-compiler-utils,2.2.0,MIT
@@ -133,7 +134,6 @@ asciidoctor,1.5.6.2,MIT
 asciidoctor-plantuml,0.0.8,MIT
 asn1.js,4.10.1,MIT
 assert,1.4.1,MIT
-asset_sync,2.4.0,MIT
 assign-symbols,1.0.0,MIT
 async-each,1.0.1,MIT
 async-limiter,1.0.0,MIT
@@ -161,7 +161,6 @@ big.js,3.2.0,MIT
 binary-extensions,1.11.0,MIT
 binaryextensions,2.1.1,MIT
 bindata,2.4.3,ruby
-blackst0ne-mermaid,7.1.0-fixed,MIT
 bluebird,3.5.1,MIT
 bn.js,4.11.8,MIT
 body-parser,1.18.2,MIT
@@ -264,8 +263,8 @@ css-selector-tokenizer,0.7.0,MIT
 css_parser,1.5.0,MIT
 cssesc,0.1.0,MIT
 cyclist,0.2.2,MIT*
-d3,3.5.17,New BSD
 d3,4.12.2,New BSD
+d3,4.13.0,New BSD
 d3-array,1.2.1,New BSD
 d3-axis,1.0.8,New BSD
 d3-brush,1.0.4,New BSD
@@ -278,6 +277,7 @@ d3-dsv,1.0.8,New BSD
 d3-ease,1.0.3,New BSD
 d3-force,1.1.0,New BSD
 d3-format,1.2.1,New BSD
+d3-format,1.2.2,New BSD
 d3-geo,1.9.1,New BSD
 d3-hierarchy,1.1.5,New BSD
 d3-interpolate,1.1.6,New BSD
@@ -289,6 +289,7 @@ d3-random,1.1.0,New BSD
 d3-request,1.0.6,New BSD
 d3-scale,1.0.7,New BSD
 d3-selection,1.2.0,New BSD
+d3-selection,1.3.0,New BSD
 d3-shape,1.2.0,New BSD
 d3-time,1.0.8,New BSD
 d3-time-format,2.1.1,New BSD
@@ -296,8 +297,8 @@ d3-timer,1.0.7,New BSD
 d3-transition,1.1.1,New BSD
 d3-voronoi,1.1.2,New BSD
 d3-zoom,1.7.1,New BSD
-dagre-d3-renderer,0.4.24,MIT
-dagre-layout,0.8.0,MIT
+dagre-d3-renderer,0.5.8,MIT
+dagre-layout,0.8.8,MIT
 date-now,0.1.4,MIT
 dateformat,3.0.3,MIT
 de-indent,1.0.2,MIT
@@ -328,7 +329,6 @@ device_detector,1.0.0,LGPL
 devise,4.4.3,MIT
 devise-two-factor,3.0.0,MIT
 diff,3.5.0,New BSD
-diff-lcs,1.3,"MIT,Artistic-2.0,GPL-2.0+"
 diffie-hellman,5.0.2,MIT
 diffy,3.1.0,MIT
 document-register-element,1.3.0,MIT
@@ -370,6 +370,7 @@ es6-promise,3.0.2,MIT
 escape-html,1.0.3,MIT
 escape-string-regexp,1.0.5,MIT
 escape_utils,1.1.1,MIT
+escaper,2.5.3,MIT
 eslint-scope,4.0.0,Simplified BSD
 esrecurse,4.2.1,Simplified BSD
 estraverse,4.2.0,Simplified BSD
@@ -447,12 +448,8 @@ get-value,2.0.6,MIT
 get_process_mem,0.2.0,MIT
 gettext_i18n_rails,1.8.0,MIT
 gettext_i18n_rails_js,1.3.0,MIT
-gitaly-proto,0.118.1,MIT
-github-linguist,5.3.3,MIT
+gitaly-proto,0.123.0,MIT
 github-markup,1.7.0,MIT
-gitlab-flowdock-git-hook,1.0.1,MIT
-gitlab-gollum-lib,4.2.7.5,MIT
-gitlab-grit,2.8.2,MIT
 gitlab-markup,1.6.4,MIT
 gitlab-sidekiq-fetcher,0.3.0,LGPL
 gitlab_omniauth-ldap,2.0.4,MIT
@@ -461,13 +458,12 @@ glob-parent,3.1.0,ISC
 global-modules-path,2.1.0,Apache 2.0
 globalid,0.4.1,MIT
 globals,11.7.0,MIT
-gollum-grit_adapter,1.0.1,MIT
 gon,6.2.0,MIT
 good-listener,1.2.2,MIT
 google-api-client,0.23.4,Apache 2.0
-google-protobuf,3.5.1,New BSD
-googleapis-common-protos-types,1.0.1,Apache 2.0
-googleauth,0.6.2,Apache 2.0
+google-protobuf,3.6.1,New BSD
+googleapis-common-protos-types,1.0.2,Apache 2.0
+googleauth,0.6.6,Apache 2.0
 got,8.3.0,MIT
 gpgme,2.0.13,LGPL-2.1+
 graceful-fs,4.1.11,ISC
@@ -476,9 +472,9 @@ grape-entity,0.7.1,MIT
 grape-path-helpers,1.0.6,MIT
 grape_logging,1.7.0,MIT
 graphiql-rails,1.4.10,MIT
-graphlib,2.1.1,MIT
+graphlibrary,2.2.0,MIT
 graphql,1.8.1,MIT
-grpc,1.11.0,Apache 2.0
+grpc,1.15.0,Apache 2.0
 gzip-size,5.0.0,MIT
 hamlit,2.8.8,MIT
 hangouts-chat,0.0.5,MIT
@@ -572,6 +568,7 @@ is-plain-obj,1.1.0,MIT
 is-plain-object,2.0.4,MIT
 is-promise,2.1.0,MIT
 is-regex,1.0.4,MIT
+is-regexp,1.0.0,MIT
 is-retry-allowed,1.1.0,MIT
 is-stream,1.1.0,MIT
 is-symbol,1.0.2,MIT
@@ -620,7 +617,6 @@ lazy-cache,2.0.2,MIT
 lcid,2.0.0,MIT
 licensee,8.9.2,MIT
 lie,3.1.1,MIT
-little-plugger,1.1.4,MIT
 loader-runner,2.3.0,MIT
 loader-utils,1.1.0,MIT
 locale,2.1.2,"ruby,LGPLv3+"
@@ -635,7 +631,6 @@ lodash.get,4.4.2,MIT
 lodash.isequal,4.5.0,MIT
 lodash.mergewith,4.6.0,MIT
 lodash.startcase,4.4.0,MIT
-logging,2.2.2,MIT
 lograge,0.10.0,MIT
 loofah,2.2.2,MIT
 loose-envify,1.4.0,MIT
@@ -658,6 +653,7 @@ memoist,0.16.0,MIT
 memory-fs,0.4.1,MIT
 merge-descriptors,1.0.1,MIT
 merge-source-map,1.1.0,MIT
+mermaid,8.0.0-rc.8,MIT
 method_source,0.9.0,MIT
 methods,1.1.2,MIT
 micromatch,3.1.10,MIT
@@ -685,11 +681,10 @@ mississippi,2.0.0,Simplified BSD
 mississippi,3.0.0,Simplified BSD
 mixin-deep,1.3.1,MIT
 mkdirp,0.5.1,MIT
-moment,2.19.2,MIT
+moment,2.22.2,MIT
 monaco-editor,0.14.3,MIT
 monaco-editor-webpack-plugin,1.5.4,MIT
 mousetrap,1.4.6,Apache 2.0
-mousetrap-rails,1.4.6,"MIT,Apache"
 move-concurrently,1.0.1,ISC
 ms,2.0.0,MIT
 ms,2.1.1,MIT
@@ -760,7 +755,7 @@ opener,1.5.1,(WTFPL OR MIT)
 opn,4.0.2,MIT
 org-ruby,0.9.12,MIT
 orm_adapter,0.5.0,MIT
-os,0.9.6,MIT
+os,1.0.0,MIT
 os-browserify,0.3.0,MIT
 os-homedir,1.0.2,MIT
 os-locale,3.0.1,MIT
@@ -806,7 +801,6 @@ pkg-dir,3.0.0,MIT
 po_to_json,1.0.1,MIT
 popper.js,1.14.3,MIT
 posix-character-classes,0.1.1,MIT
-posix-spawn,0.3.13,MIT
 postcss,6.0.23,MIT
 postcss-modules-extract-imports,1.2.0,ISC
 postcss-modules-local-by-default,1.2.0,MIT
@@ -830,6 +824,8 @@ prr,1.0.1,MIT
 pseudomap,1.0.2,ISC
 public-encrypt,4.0.0,MIT
 public_suffix,3.0.3,MIT
+puma,3.12.0,New BSD
+puma_worker_killer,0.1.0,MIT
 pump,2.0.1,MIT
 pump,3.0.0,MIT
 pumpify,1.4.0,MIT
@@ -929,7 +925,7 @@ ruby_parser,3.9.0,MIT
 rubyntlm,0.6.2,MIT
 rubypants,0.2.0,BSD
 rufus-scheduler,3.4.0,MIT
-rugged,0.27.4,MIT
+rugged,0.27.5,MIT
 run-async,2.3.0,MIT
 run-queue,1.0.3,ISC
 rw,1.3.3,New BSD
@@ -949,6 +945,7 @@ sawyer,0.8.1,MIT
 sax,1.2.4,ISC
 schema-utils,0.4.5,MIT
 schema-utils,1.0.0,MIT
+scope-css,1.2.1,MIT
 seed-fu,2.3.7,MIT
 select,1.1.2,MIT
 select2,3.5.2-browserify,Apache*
@@ -975,8 +972,9 @@ shebang-regex,1.0.0,MIT
 sidekiq,5.2.1,LGPL
 sidekiq-cron,0.6.0,MIT
 signal-exit,3.0.2,ISC
-signet,0.8.1,Apache 2.0
+signet,0.11.0,Apache 2.0
 slack-notifier,1.5.1,MIT
+slugify,1.3.1,MIT
 smooshpack,0.0.48,LGPL
 snapdragon,0.8.1,MIT
 snapdragon-node,2.1.1,MIT
@@ -1012,9 +1010,9 @@ string-width,1.0.2,MIT
 string-width,2.1.1,MIT
 string_decoder,0.10.31,MIT
 string_decoder,1.1.1,MIT
-stringex,2.8.4,MIT
 strip-ansi,3.0.1,MIT
 strip-ansi,4.0.0,MIT
+strip-css-comments,3.0.0,MIT
 strip-eof,1.0.0,MIT
 strip-json-comments,2.0.1,MIT
 style-loader,0.23.0,MIT