Skip to content

Commit fc476a2

Browse files
Merge branch 'master' into 2020-06-05-fix-copy-blocklist
2 parents 564467e + d935600 commit fc476a2

File tree

441 files changed

+7002
-3624
lines changed

Some content is hidden

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

441 files changed

+7002
-3624
lines changed

.backportrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"targetBranchChoices": [
44
{ "name": "master", "checked": true },
55
{ "name": "7.x", "checked": true },
6+
"7.8",
67
"7.7",
78
"7.6",
89
"7.5",

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ module.exports = {
238238
],
239239
from: [
240240
'(src|x-pack)/plugins/**/(public|server)/**/*',
241+
'!(src|x-pack)/plugins/**/(public|server)/mocks/index.{js,ts}',
241242
'!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,ts,tsx}',
242243
],
243244
allowSameFolder: true,

.i18nrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"src/plugins/telemetry",
4444
"src/plugins/telemetry_management_section"
4545
],
46-
"tileMap": "src/legacy/core_plugins/tile_map",
46+
"tileMap": "src/plugins/tile_map",
4747
"timelion": ["src/legacy/core_plugins/timelion", "src/plugins/vis_type_timelion"],
4848
"uiActions": "src/plugins/ui_actions",
4949
"visDefaultEditor": "src/plugins/vis_default_editor",
66.3 KB
Loading
1.67 KB
Loading
83.4 KB
Loading
52.7 KB
Loading
1.19 KB
Loading
39.6 KB
Loading
57.1 KB
Loading

0 commit comments

Comments
 (0)