Skip to content

Commit

Permalink
Merge branch '7.x' into backport/7.x/pr-82383
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Dec 3, 2020
2 parents 058a027 + 6be10bd commit a63fad8
Show file tree
Hide file tree
Showing 65 changed files with 1,567 additions and 1,484 deletions.
91 changes: 50 additions & 41 deletions docs/CHANGELOG.asciidoc

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion docs/settings/reporting-settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,9 @@ For information about {kib} memory limits, see <<production, using {kib} in a pr
[cols="2*<"]
|===
| `xpack.reporting.index`
| Reporting uses a weekly index in {es} to store the reporting job and
| *deprecated* This setting is deprecated and will be removed in 8.0. Multitenancy by changing
`kibana.index` will not be supported starting in 8.0. See https://ela.st/kbn-remove-legacy-multitenancy[8.0 Breaking Changes]
for more details. Reporting uses a weekly index in {es} to store the reporting job and
the report content. The index is automatically created if it does not already
exist. Configure this to a unique value, beginning with `.reporting-`, for every
{kib} instance that has a unique <<kibana-index, `kibana.index`>> setting. Defaults to `.reporting`.
Expand Down
162 changes: 0 additions & 162 deletions src/plugins/discover/public/application/_discover.scss

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export function ActionBar({
</EuiButtonEmpty>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFormRow>
<EuiFormRow display="center">
<EuiFieldNumber
aria-label={
isSuccessor
Expand All @@ -130,6 +130,7 @@ export function ActionBar({
defaultMessage: 'Number of newer documents',
})
}
compressed
className="cxtSizePicker"
data-test-subj={`${type}CountPicker`}
disabled={isDisabled}
Expand Down

This file was deleted.

Loading

0 comments on commit a63fad8

Please sign in to comment.