Skip to content

Commit

Permalink
Merge branch '7.9' into backport/7.9/pr-71594
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine committed Jul 16, 2020
2 parents 135ed26 + 561612c commit 4f77208
Show file tree
Hide file tree
Showing 135 changed files with 3,653 additions and 1,623 deletions.
13 changes: 13 additions & 0 deletions .ci/pipeline-library/src/test/prChanges.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,17 @@ class PrChangesTest extends KibanaBasePipelineTest {

assertFalse(prChanges.areChangesSkippable())
}

@Test
void 'areChangesSkippable() with skippable changes that are in notSkippablePaths'() {
props([
githubPrs: [
getChanges: { [
[filename: 'docs/developer/architecture/code-exploration.asciidoc'],
] },
],
])

assertFalse(prChanges.areChangesSkippable())
}
}
15 changes: 2 additions & 13 deletions docs/CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,9 @@ This section summarizes the changes in each release.
[[release-notes-7.8.1]]
== {kib} 7.8.1

See also <<breaking-changes-7.8,breaking changes in 7.8>>.
coming::[7.8.1]

[float]
[[security-update-7.8.1]]
=== Security updates
* In {kib} 7.8.1 and earlier, there is a denial of service (DoS) flaw in Timelion. Attackers can construct a URL that when viewed
by a {kib} user, the {kib} process consumes large amounts of CPU and becomes unresponsive, CVE-2020-7016.
+
You must upgrade to 7.8.1. If you are unable to upgrade, set `timelion.enabled` to `false` in your kibana.yml file to disable Timelion.

* In all {kib} versions, region map visualizations contain a stored XSS flaw. Attackers that can edit or create region map visualizations can obtain sensitive information
or perform destructive actions on behalf of {kib} users who view the region map visualization, CVE-2020-7017.
+
You must upgrade to 7.8.1. If you are unable to upgrade, set `xpack.maps.enabled`, `region_map.enabled`, and `tile_map.enabled` to `false` in kibana.yml to disable map visualizations.
See also <<breaking-changes-7.8,breaking changes in 7.8>>.

[float]
[[bug-v7.8.1]]
Expand Down
Loading

0 comments on commit 4f77208

Please sign in to comment.