Merge branch 'master' into issue_104154

elastic · Aug 9, 2021 · 0b7b4d9 · 0b7b4d9
2 parents 13b6df5 + 21f4de8
commit 0b7b4d9
Show file tree

Hide file tree

Showing 1,225 changed files with 24,745 additions and 21,652 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -470,11 +470,6 @@ module.exports = {
                 errorMessage:
                   'Server modules cannot be imported into client modules or shared modules.',
               },
-              {
-                target: ['src/**/*'],
-                from: ['x-pack/**/*'],
-                errorMessage: 'OSS cannot import x-pack files.',
-              },
               {
                 target: ['src/core/**/*'],
                 from: ['plugins/**/*', 'src/plugins/**/*'],

diff --git a/.i18nrc.json b/.i18nrc.json
@@ -9,6 +9,7 @@
     "data": "src/plugins/data",
     "embeddableApi": "src/plugins/embeddable",
     "embeddableExamples": "examples/embeddable_examples",
+    "fieldFormats": "src/plugins/field_formats",
     "uiActionsExamples": "examples/ui_action_examples",
     "share": "src/plugins/share",
     "home": "src/plugins/home",
@@ -35,6 +36,7 @@
     "monaco": "packages/kbn-monaco/src",
     "esQuery": "packages/kbn-es-query/src",
     "presentationUtil": "src/plugins/presentation_util",
+    "indexPatternEditor": "src/plugins/index_pattern_editor",
     "indexPatternFieldEditor": "src/plugins/index_pattern_field_editor",
     "indexPatternManagement": "src/plugins/index_pattern_management",
     "interactiveSetup": "src/plugins/interactive_setup",

diff --git a/api_docs/timelines.json b/api_docs/timelines.json
@@ -10918,7 +10918,7 @@
             "label": "alertConsumers",
             "description": [],
             "signature": [
-              "ALERTS_CONSUMERS",
+              "AlertConsumers",
               "[] | undefined"
             ],
             "path": "x-pack/plugins/timelines/common/search_strategy/timeline/index.ts",