Skip to content

Commit

Permalink
Merge branch 'master' into ML-93392-support-aliases
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored May 5, 2021
2 parents 29e1d9f + 349b7e9 commit 88ec051
Show file tree
Hide file tree
Showing 597 changed files with 26,250 additions and 4,450 deletions.
2 changes: 1 addition & 1 deletion .ci/es-snapshots/Jenkinsfile_verify_es
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ kibanaPipeline(timeoutMinutes: 210) {
}

task {
kibanaPipeline.buildXpack(10)
kibanaPipeline.buildXpack(10, true)
tasks.xpackCiGroups()
tasks.xpackCiGroupDocker()
}
Expand Down
16 changes: 16 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -1256,6 +1256,22 @@ module.exports = {
},
},

/**
* Discover overrides
*/
{
files: ['src/plugins/discover/**/*.{ts,tsx}'],
rules: {
'@typescript-eslint/no-explicit-any': 'error',
'@typescript-eslint/ban-ts-comment': [
'error',
{
'ts-expect-error': false,
},
],
},
},

/**
* Enterprise Search overrides
* NOTE: We also have a single rule at the bottom of the file that
Expand Down
Loading

0 comments on commit 88ec051

Please sign in to comment.