Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
318ce0bc71
commit
baf5b5480a
|
@ -12,17 +12,9 @@ class Vulnerability < ApplicationRecord
|
|||
'[vulnerability:'
|
||||
end
|
||||
|
||||
def self.reference_prefix_escaped
|
||||
'[vulnerability['
|
||||
end
|
||||
|
||||
def self.reference_postfix
|
||||
']'
|
||||
end
|
||||
|
||||
def self.reference_postfix_escaped
|
||||
']'
|
||||
end
|
||||
end
|
||||
|
||||
Vulnerability.prepend_ee_mod
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
"@gitlab/favicon-overlay": "2.0.0",
|
||||
"@gitlab/svgs": "1.182.0",
|
||||
"@gitlab/tributejs": "1.0.0",
|
||||
"@gitlab/ui": "27.4.3",
|
||||
"@gitlab/ui": "27.4.6",
|
||||
"@gitlab/visual-review-tools": "1.6.1",
|
||||
"@rails/actioncable": "^6.0.3-4",
|
||||
"@rails/ujs": "^6.0.3-4",
|
||||
|
|
28
yarn.lock
28
yarn.lock
|
@ -892,17 +892,17 @@
|
|||
resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8"
|
||||
integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw==
|
||||
|
||||
"@gitlab/ui@27.4.3":
|
||||
version "27.4.3"
|
||||
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-27.4.3.tgz#cc65721de9de689b870673bf8efbfd39afe6399c"
|
||||
integrity sha512-to6NJEYYqNG199VnwqQwV3vOJwK+0jlxW1tiqny/u7RRi+HPmjJD0hDxlx1dnyaaYXoRjgoXOPyjHCGVGyFZwA==
|
||||
"@gitlab/ui@27.4.6":
|
||||
version "27.4.6"
|
||||
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-27.4.6.tgz#2364c2ba981024cdce32b4657c5f0eb2ae781a4d"
|
||||
integrity sha512-0fUNgu0tjk/BBq9NmuZg7THcEsUvfhz/mhUwnLWB5hjrfa7Nnu+TRBgeVfs08vDyK7h6uualgITTH+eTGo6tyw==
|
||||
dependencies:
|
||||
"@babel/standalone" "^7.0.0"
|
||||
"@gitlab/vue-toasted" "^1.3.0"
|
||||
bootstrap-vue "2.13.1"
|
||||
copy-to-clipboard "^3.0.8"
|
||||
dompurify "^2.2.6"
|
||||
echarts "^4.2.1"
|
||||
echarts "^4.9.0"
|
||||
highlight.js "^9.13.1"
|
||||
js-beautify "^1.8.8"
|
||||
lodash "^4.17.20"
|
||||
|
@ -4296,12 +4296,12 @@ ecc-jsbn@~0.1.1:
|
|||
jsbn "~0.1.0"
|
||||
safer-buffer "^2.1.0"
|
||||
|
||||
echarts@^4.2.1:
|
||||
version "4.6.0"
|
||||
resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.6.0.tgz#b5a47a1046cec93ceeef954f9ee54751340558ec"
|
||||
integrity sha512-xKkcr6v9UVOSF+PMuj7Ngt3bnzLwN1sSXWCvpvX+jYb3mePYsZnABq7wGkPac/m0nV653uGHXoHK8DCKCprdNg==
|
||||
echarts@^4.9.0:
|
||||
version "4.9.0"
|
||||
resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.9.0.tgz#a9b9baa03f03a2a731e6340c55befb57a9e1347d"
|
||||
integrity sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA==
|
||||
dependencies:
|
||||
zrender "4.2.0"
|
||||
zrender "4.3.2"
|
||||
|
||||
editions@^1.3.3:
|
||||
version "1.3.4"
|
||||
|
@ -13220,7 +13220,7 @@ zen-observable@^0.8.0:
|
|||
resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.11.tgz#d3415885eeeb42ee5abb9821c95bb518fcd6d199"
|
||||
integrity sha512-N3xXQVr4L61rZvGMpWe8XoCGX8vhU35dPyQ4fm5CY/KDlG0F75un14hjbckPXTDuKUY6V0dqR2giT6xN8Y4GEQ==
|
||||
|
||||
zrender@4.2.0:
|
||||
version "4.2.0"
|
||||
resolved "https://registry.yarnpkg.com/zrender/-/zrender-4.2.0.tgz#d001302e155f28de1f9fc7fcd5c254bad28471cf"
|
||||
integrity sha512-YJ9hxt5uFincYYU3KK31+Ce+B6PJmYYK0Q9fQ6jOUAoC/VHbe4kCKAPkxKeT7jGTxrK5wYu18R0TLGqj2zbEOA==
|
||||
zrender@4.3.2:
|
||||
version "4.3.2"
|
||||
resolved "https://registry.yarnpkg.com/zrender/-/zrender-4.3.2.tgz#ec7432f9415c82c73584b6b7b8c47e1b016209c6"
|
||||
integrity sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g==
|
||||
|
|
Loading…
Reference in New Issue