Skip to content

Commit

Permalink
Merge branch 'master' of github.com:elastic/kibana into renovate/hapi
Browse files Browse the repository at this point in the history
  • Loading branch information
spalger committed Oct 29, 2019
2 parents bc75473 + 871212e commit a25788a
Show file tree
Hide file tree
Showing 98 changed files with 1,660 additions and 1,084 deletions.
6 changes: 0 additions & 6 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -229,12 +229,6 @@ module.exports = {
'react-hooks/exhaustive-deps': 'off',
},
},
{
files: ['x-pack/legacy/plugins/spaces/**/*.{js,ts,tsx}'],
rules: {
'react-hooks/exhaustive-deps': 'off',
},
},
{
files: ['x-pack/legacy/plugins/transform/**/*.{js,ts,tsx}'],
rules: {
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ _Note: The version numbers below are only examples, meant to illustrate the rela

## Questions? Problems? Suggestions?

- If you've found a bug or want to request a feature, please create a [GitHub Issue](https://github.com/elastic/kibana/issues/new).
Please check to make sure someone else hasn't already created an issue for the same topic.
- If you've found a bug or want to request a feature, please create a [GitHub Issue](https://github.com/elastic/kibana/issues/new/choose).
Please check to make sure someone else hasn't already created an issue for the same topic.
- Need help using Kibana? Ask away on our [Kibana Discuss Forum](https://discuss.elastic.co/c/kibana) and a fellow community member or
Elastic engineer will be glad to help you out.
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": "^13.5.9",
"@elastic/datemath": "5.0.2",
"@elastic/ems-client": "1.0.5",
"@elastic/eui": "14.7.0",
"@elastic/eui": "14.8.0",
"@elastic/filesaver": "1.1.2",
"@elastic/good": "8.2.3-kibana1",
"@elastic/numeral": "2.3.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export function DiscoverFieldSearch({
defaultMessage: 'Show field filter settings',
});
const searchPlaceholder = i18n.translate('kbn.discover.fieldChooser.searchPlaceHolder', {
defaultMessage: 'Search fields',
defaultMessage: 'Search field names',
});

return (
Expand Down Expand Up @@ -97,7 +97,7 @@ export function DiscoverFieldSearch({
>
<FormattedMessage
id="kbn.discover.fieldChooser.fieldFilterFacetButtonLabel"
defaultMessage="Fields filtered"
defaultMessage="Filter by type"
/>
</EuiFacetButton>
</React.Fragment>
Expand Down

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

2 changes: 1 addition & 1 deletion src/legacy/ui/public/agg_types/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function isValidJson(value: string): boolean {
}
}

function isValidInterval(value: string, baseInterval: string) {
function isValidInterval(value: string, baseInterval?: string) {
if (baseInterval) {
return _parseWithBase(value, baseInterval);
} else {
Expand Down
13 changes: 7 additions & 6 deletions src/legacy/ui/public/vis/default_feedback_message.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@

import { i18n } from '@kbn/i18n';

export const defaultFeedbackMessage = i18n.translate('common.ui.vis.defaultFeedbackMessage',
{
defaultMessage: 'Have feedback? Please create an issue in {link}.',
values: { link: '<a href="https://github.com/elastic/kibana/issues/new" rel="noopener noreferrer" target="_blank">GitHub</a>' }
}
);
export const defaultFeedbackMessage = i18n.translate('common.ui.vis.defaultFeedbackMessage', {
defaultMessage: 'Have feedback? Please create an issue in {link}.',
values: {
link:
'<a href="https://github.com/elastic/kibana/issues/new/choose" rel="noopener noreferrer" target="_blank">GitHub</a>',
},
});
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "14.7.0",
"@elastic/eui": "14.8.0",
"react": "^16.8.0",
"react-dom": "^16.8.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "14.7.0",
"@elastic/eui": "14.8.0",
"react": "^16.8.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "14.7.0",
"@elastic/eui": "14.8.0",
"react": "^16.8.0"
},
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "14.7.0",
"@elastic/eui": "14.8.0",
"react": "^16.8.0"
},
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "14.7.0",
"@elastic/eui": "14.8.0",
"react": "^16.8.0",
"react-dom": "^16.8.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ export function SpanFlyout({
),
content: (
<Fragment>
<EuiSpacer size="m" />
<SpanMetadata span={span} />
</Fragment>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import {
EuiFlyoutHeader,
EuiPortal,
EuiSpacer,
EuiTitle
EuiTitle,
EuiHorizontalRule
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React from 'react';
Expand Down Expand Up @@ -40,7 +41,6 @@ function TransactionPropertiesTable({
<EuiTitle size="s">
<h4>Metadata</h4>
</EuiTitle>
<EuiSpacer />
<TransactionMetadata transaction={transaction} />
</div>
);
Expand Down Expand Up @@ -87,7 +87,7 @@ export function TransactionFlyout({
totalDuration={traceRootDuration}
errorCount={errorCount}
/>
<EuiSpacer size="m" />
<EuiHorizontalRule margin="m" />
<DroppedSpansWarning transactionDoc={transactionDoc} />
<TransactionPropertiesTable transaction={transactionDoc} />
</EuiFlyoutBody>
Expand Down

This file was deleted.

Loading

0 comments on commit a25788a

Please sign in to comment.