Merge upstream/7.x into backport/7.x/pr-100922

elastic · Jun 9, 2021 · fef26bd · fef26bd
2 parents f635a79 + 5f01e72
commit fef26bd
Show file tree

Hide file tree

Showing 1,473 changed files with 21,791 additions and 11,052 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1374,7 +1374,7 @@ module.exports = {
     {
       // Source files only - allow `any` in test/mock files
       files: ['x-pack/plugins/enterprise_search/**/*.{ts,tsx}'],
-      excludedFiles: ['x-pack/plugins/enterprise_search/**/*.{test,mock}.{ts,tsx}'],
+      excludedFiles: ['x-pack/plugins/enterprise_search/**/*.{test,mock,test_helper}.{ts,tsx}'],
       rules: {
         '@typescript-eslint/no-explicit-any': 'error',
       },

diff --git a/api_docs/actions.json b/api_docs/actions.json
@@ -1054,7 +1054,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts",
-          "lineNumber": 121
+          "lineNumber": 129
         },
         "deprecated": false,
         "initialIsOpen": false

diff --git a/api_docs/apm.json b/api_docs/apm.json
@@ -78,7 +78,7 @@
       ],
       "source": {
         "path": "x-pack/plugins/apm/public/plugin.ts",
-        "lineNumber": 45
+        "lineNumber": 47
       },
       "deprecated": false,
       "lifecycle": "setup",
@@ -96,7 +96,7 @@
       ],
       "source": {
         "path": "x-pack/plugins/apm/public/plugin.ts",
-        "lineNumber": 47
+        "lineNumber": 49
       },
       "deprecated": false,
       "lifecycle": "start",