Skip to content

Commit 75fcb4d

Browse files
elasticmachineelasticmachine
authored
Merge branch '7.8' into backport/7.8/pr-71268_commit-b7a8a4a5_commit-ea4d36f7
2 parents ce9907f + 0398448 commit 75fcb4d

4 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,12 @@
145145
"JSONStream": "1.3.5",
146146
"abortcontroller-polyfill": "^1.4.0",
147147
"accept": "3.0.2",
148-
"angular": "^1.7.9",
149-
"angular-aria": "^1.7.9",
148+
"angular": "^1.8.0",
149+
"angular-aria": "^1.8.0",
150150
"angular-elastic": "^2.5.1",
151151
"angular-recursion": "^1.0.5",
152-
"angular-route": "^1.7.9",
153-
"angular-sanitize": "^1.7.9",
152+
"angular-route": "^1.8.0",
153+
"angular-sanitize": "^1.8.0",
154154
"angular-sortable-view": "^0.0.17",
155155
"autoprefixer": "^9.7.4",
156156
"babel-loader": "^8.0.6",

‎packages/kbn-ui-shared-deps/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@elastic/numeral": "^2.5.0",
1515
"@kbn/i18n": "1.0.0",
1616
"abortcontroller-polyfill": "^1.4.0",
17-
"angular": "^1.7.9",
17+
"angular": "^1.8.0",
1818
"compression-webpack-plugin": "^3.1.0",
1919
"core-js": "^3.2.1",
2020
"custom-event-polyfill": "^0.3.0",

‎x-pack/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,9 @@
208208
"@slack/webhook": "^5.0.0",
209209
"@turf/boolean-contains": "6.0.1",
210210
"@turf/circle": "6.0.1",
211-
"angular": "^1.7.9",
212-
"angular-resource": "1.7.9",
213-
"angular-sanitize": "1.7.9",
211+
"angular": "^1.8.0",
212+
"angular-resource": "1.8.0",
213+
"angular-sanitize": "1.8.0",
214214
"angular-ui-ace": "0.2.3",
215215
"apollo-cache-inmemory": "1.6.2",
216216
"apollo-client": "^2.3.8",

‎yarn.lock‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5858,10 +5858,10 @@ ammo@3.x.x:
58585858
dependencies:
58595859
hoek "5.x.x"
58605860

5861-
angular-aria@^1.7.9:
5862-
version "1.7.9"
5863-
resolved "https://registry.yarnpkg.com/angular-aria/-/angular-aria-1.7.9.tgz#90c61895ffbd876e95915222b32a7bd0070af7e3"
5864-
integrity sha512-luI3Jemd1AbOQW0krdzfEG3fM0IFtLY0bSSqIDEx3POE0XjKIC1MkrO8Csyq9PPgueLphyAPofzUwZ8YeZ88SA==
5861+
angular-aria@^1.8.0:
5862+
version "1.8.0"
5863+
resolved "https://registry.yarnpkg.com/angular-aria/-/angular-aria-1.8.0.tgz#97aec9b1e8bafd07d5fab30f98d8ec832e18e25d"
5864+
integrity sha512-eCQI6EwgY6bYHdzIUfDABHnZjoZ3bNYpCsnceQF4bLfbq1QtZ7raRPNca45sj6C9Pfjde6PNcEDvuLozFPYnrQ==
58655865

58665866
angular-elastic@^2.5.1:
58675867
version "2.5.1"
@@ -5880,20 +5880,20 @@ angular-recursion@^1.0.5:
58805880
resolved "https://registry.yarnpkg.com/angular-recursion/-/angular-recursion-1.0.5.tgz#cd405428a0bf55faf52eaa7988c1fe69cd930543"
58815881
integrity sha1-zUBUKKC/Vfr1Lqp5iMH+ac2TBUM=
58825882

5883-
angular-resource@1.7.9:
5884-
version "1.7.9"
5885-
resolved "https://registry.yarnpkg.com/angular-resource/-/angular-resource-1.7.9.tgz#fa53623fae2c60debe2410d692447dcb0ba02396"
5886-
integrity sha512-rXXhCE2qT31Pn4Sl+2XL+ntv4zxnA2OzY+clCl8/pOp/s/gIzxpQlEtXipo3QK8Qur3glbIkeF/bJw+gjVAdUw==
5883+
angular-resource@1.8.0:
5884+
version "1.8.0"
5885+
resolved "https://registry.yarnpkg.com/angular-resource/-/angular-resource-1.8.0.tgz#578ef122e7cb7bcc6c0ad6c2451dc3d27fd570ba"
5886+
integrity sha512-9woUq3kDwoT7R6SjKX8vaJMhOplYBm9sqRAxKgDhDIdPyA8iBowqQIusf9+8Q+z/HlXb8ZXvKspJyKXrxmKdvg==
58875887

5888-
angular-route@^1.7.9:
5889-
version "1.7.9"
5890-
resolved "https://registry.yarnpkg.com/angular-route/-/angular-route-1.7.9.tgz#f9910a2af0ba3ad7a969c5dd369b8360d0d5e4ef"
5891-
integrity sha512-vRoj5hzdQtWbODhWJqDzD1iNOEfCKshO6GFBuPVV7RHlPjzIc4R2dHCc7Qiv/8F3LDxJDohc6vSnTDMLHuaqeA==
5888+
angular-route@^1.8.0:
5889+
version "1.8.0"
5890+
resolved "https://registry.yarnpkg.com/angular-route/-/angular-route-1.8.0.tgz#cb8066c5d34284ffd6a15ac7be1b3d51c5ad7bb2"
5891+
integrity sha512-ORvXAdVfCCA6XFwyjSkVQFFGufj0mNGiCvBR93Qsii8+7t/6Ioy6wheUoCj1x4NWUv7hAq3nYYGCVO6QEKb1BQ==
58925892

5893-
angular-sanitize@1.7.9, angular-sanitize@^1.7.9:
5894-
version "1.7.9"
5895-
resolved "https://registry.yarnpkg.com/angular-sanitize/-/angular-sanitize-1.7.9.tgz#6b4d5e826abdabd352b13a7c65c8c74daf6a7b15"
5896-
integrity sha512-nB/xe7JQWF9nLvhHommAICQ3eWrfRETo0EVGFESi952CDzDa+GAJ/2BFBNw44QqQPxj1Xua/uYKrbLsOGWZdbQ==
5893+
angular-sanitize@1.8.0, angular-sanitize@^1.8.0:
5894+
version "1.8.0"
5895+
resolved "https://registry.yarnpkg.com/angular-sanitize/-/angular-sanitize-1.8.0.tgz#9f80782d3afeec3bcc0bb92b3ca6f1f421cfbca6"
5896+
integrity sha512-j5GiOPCvfcDWK5svEOVoPb11X3UDVy/mdHPRWuy14Iyw86xaq+Bb+x/em2sAOa5MQQeY5ciLXbF3RRp8iCKcNg==
58975897

58985898
angular-sortable-view@^0.0.17:
58995899
version "0.0.17"
@@ -5905,10 +5905,10 @@ angular-ui-ace@0.2.3:
59055905
resolved "https://registry.yarnpkg.com/angular-ui-ace/-/angular-ui-ace-0.2.3.tgz#3cb903428100621a367fc7f641440e97a42a26d0"
59065906
integrity sha1-PLkDQoEAYho2f8f2QUQOl6QqJtA=
59075907

5908-
angular@>=1.0.6, angular@^1.7.9:
5909-
version "1.7.9"
5910-
resolved "https://registry.yarnpkg.com/angular/-/angular-1.7.9.tgz#e52616e8701c17724c3c238cfe4f9446fd570bc4"
5911-
integrity sha512-5se7ZpcOtu0MBFlzGv5dsM1quQDoDeUTwZrWjGtTNA7O88cD8TEk5IEKCTDa3uECV9XnvKREVUr7du1ACiWGFQ==
5908+
angular@>=1.0.6, angular@^1.8.0:
5909+
version "1.8.0"
5910+
resolved "https://registry.yarnpkg.com/angular/-/angular-1.8.0.tgz#b1ec179887869215cab6dfd0df2e42caa65b1b51"
5911+
integrity sha512-VdaMx+Qk0Skla7B5gw77a8hzlcOakwF8mjlW13DpIWIDlfqwAbSSLfd8N/qZnzEmQF4jC4iofInd3gE7vL8ZZg==
59125912

59135913
ansi-align@^2.0.0:
59145914
version "2.0.0"

0 commit comments

Comments
 (0)