Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/7.x' into backport/7.x/pr-52633
Browse files Browse the repository at this point in the history
  • Loading branch information
flash1293 committed Dec 20, 2019
2 parents 99bf968 + a5b5a8d commit d0cb4de
Show file tree
Hide file tree
Showing 159 changed files with 1,023 additions and 681 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"@elastic/charts": "^14.0.0",
"@elastic/datemath": "5.0.2",
"@elastic/ems-client": "1.0.5",
"@elastic/eui": "17.0.0",
"@elastic/eui": "17.1.2",
"@elastic/filesaver": "1.1.2",
"@elastic/good": "8.1.1-kibana2",
"@elastic/numeral": "2.3.3",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const columns = [
))}
</EuiButtonEmpty>
),
dataType: 'string',
dataType: 'string' as const,
sortable: ({ sort }: { sort: string }) => sort,
},
];
Expand All @@ -72,7 +72,7 @@ const pagination = {
const sorting = {
sort: {
field: 'title',
direction: 'asc',
direction: 'asc' as const,
},
};

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d0cb4de

Please sign in to comment.