Skip to content

Commit cd4b4d6

Browse files
elasticmachineelasticmachine
authored
Merge branch '7.x' into backport/7.x/pr-63268
2 parents 3a4b187 + f84e8b5 commit cd4b4d6

1,934 files changed

Lines changed: 12575 additions & 5602 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ module.exports = {
569569
*/
570570
{
571571
// front end typescript and javascript files only
572-
files: ['x-pack/legacy/plugins/siem/public/**/*.{js,ts,tsx}'],
572+
files: ['x-pack/plugins/siem/public/**/*.{js,ts,tsx}'],
573573
rules: {
574574
'import/no-nodejs-modules': 'error',
575575
'no-restricted-imports': [
@@ -618,7 +618,7 @@ module.exports = {
618618
// {
619619
// // will introduced after the other warns are fixed
620620
// // typescript and javascript for front end react performance
621-
// files: ['x-pack/legacy/plugins/siem/public/**/!(*.test).{js,ts,tsx}'],
621+
// files: ['x-pack/plugins/siem/public/**/!(*.test).{js,ts,tsx}'],
622622
// plugins: ['react-perf'],
623623
// rules: {
624624
// // 'react-perf/jsx-no-new-object-as-prop': 'error',

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
4242
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
4343
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
4444
'xpack-siemCypress': { processNumber ->
45-
whenChanged(['x-pack/plugins/siem/', 'x-pack/legacy/plugins/siem/', 'x-pack/test/siem_cypress/']) {
45+
whenChanged(['x-pack/plugins/siem/', 'x-pack/test/siem_cypress/']) {
4646
kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh')(processNumber)
4747
}
4848
},

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@
447447
"jest-raw-loader": "^1.0.1",
448448
"jimp": "^0.9.6",
449449
"json5": "^1.0.1",
450-
"karma": "3.1.4",
450+
"karma": "5.0.2",
451451
"karma-chrome-launcher": "2.2.0",
452452
"karma-coverage": "1.1.2",
453453
"karma-firefox-launcher": "1.1.0",

0 commit comments

Comments
 (0)