Skip to content

Commit

Permalink
Merge branch 'master' into composite-spans
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Aug 2, 2021
2 parents 086e608 + 0c69b10 commit d59a4fe
Show file tree
Hide file tree
Showing 2,042 changed files with 138,847 additions and 89,023 deletions.
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/on_merge_ts_refs_api_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ export BUILD_TS_REFS_DISABLE=false
.buildkite/scripts/bootstrap.sh

echo "--- Build API Docs"
node scripts/build_api_docs
node --max-old-space-size=12000 scripts/build_api_docs
1 change: 0 additions & 1 deletion .ci/Jenkinsfile_baseline_capture
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ kibanaPipeline(timeoutMinutes: 210) {
kibanaPipeline.withCiTaskQueue([parallel: 2]) {
catchErrors {
tasks([
kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh'),
kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh'),
kibanaPipeline.scriptTask('Check Public API Docs', 'test/scripts/checks/baseline_plugin_public_api_docs.sh'),
])
Expand Down
8 changes: 6 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,8 @@ module.exports = {
{
files: ['x-pack/plugins/cases/**/*.{js,mjs,ts,tsx}'],
rules: {
'no-duplicate-imports': 'error',
'no-duplicate-imports': 'off',
'@typescript-eslint/no-duplicate-imports': ['error'],
},
},

Expand All @@ -912,6 +913,8 @@ module.exports = {
],
rules: {
'import/no-nodejs-modules': 'error',
'no-duplicate-imports': 'off',
'@typescript-eslint/no-duplicate-imports': ['error'],
'no-restricted-imports': [
'error',
{
Expand Down Expand Up @@ -954,7 +957,7 @@ module.exports = {
'no-continue': 'error',
'no-dupe-keys': 'error',
'no-duplicate-case': 'error',
'no-duplicate-imports': 'error',
'no-duplicate-imports': 'off',
'no-empty-character-class': 'error',
'no-empty-pattern': 'error',
'no-ex-assign': 'error',
Expand Down Expand Up @@ -1025,6 +1028,7 @@ module.exports = {
'require-atomic-updates': 'error',
'symbol-description': 'error',
'vars-on-top': 'error',
'@typescript-eslint/no-duplicate-imports': ['error'],
},
},

Expand Down
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ target
*.iml
*.log

# Ignore example plugin builds
/examples/*/build

# Ignore certain functional test runner artifacts
/test/*/failure_debug
/test/*/screenshots/diff
Expand Down Expand Up @@ -76,6 +79,6 @@ report.asciidoc
.yarn-local-mirror

# Bazel
bazel
bazel-*
/bazel
/bazel-*
.bazelrc.user
Loading

0 comments on commit d59a4fe

Please sign in to comment.