Skip to content

Commit 9c55cd3

Browse files
committed
Merge remote-tracking branch 'origin/master' into lens/fix-switching-with-layers
2 parents a41ea50 + 825c168 commit 9c55cd3

File tree

295 files changed

+4563
-10907
lines changed

Some content is hidden

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

295 files changed

+4563
-10907
lines changed

.browserslistrc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
[production]
2-
last 2 versions
3-
> 5%
4-
Safari 7 # for PhantomJS support: https://github.com/elastic/kibana/issues/27136
2+
last 2 Firefox versions
3+
last 2 Chrome versions
4+
last 2 Safari versions
5+
> 0.25%
6+
not ie 11
57

68
[dev]
79
last 1 chrome versions

.ci/Jenkinsfile_baseline_capture

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ kibanaPipeline(timeoutMinutes: 120) {
88
catchError {
99
parallel([
1010
'oss-visualRegression': {
11-
workers.ci(name: 'oss-visualRegression', size: 's', ramDisk: false) {
11+
workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
1212
kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1)
1313
}
1414
},
1515
'xpack-visualRegression': {
16-
workers.ci(name: 'xpack-visualRegression', size: 's', ramDisk: false) {
16+
workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
1717
kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1)
1818
}
1919
},

.ci/Jenkinsfile_coverage

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ kibanaPipeline(timeoutMinutes: 240) {
1313
workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) {
1414
catchError {
1515
kibanaCoverage.runTests()
16+
kibanaTeamAssign.load('team_assignment', "### Upload Team Assignment JSON")
1617
handleIngestion(TIME_STAMP)
1718
}
1819
handleFail()

.ci/pipeline-library/src/test/prChanges.groovy

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,17 @@ class PrChangesTest extends KibanaBasePipelineTest {
8484

8585
assertFalse(prChanges.areChangesSkippable())
8686
}
87+
88+
@Test
89+
void 'areChangesSkippable() with skippable changes that are in notSkippablePaths'() {
90+
props([
91+
githubPrs: [
92+
getChanges: { [
93+
[filename: 'docs/developer/architecture/code-exploration.asciidoc'],
94+
] },
95+
],
96+
])
97+
98+
assertFalse(prChanges.areChangesSkippable())
99+
}
87100
}

NOTICE.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ This module was heavily inspired by the externals plugin that ships with webpack
2626
MIT License http://www.opensource.org/licenses/mit-license.php
2727
Author Tobias Koppers @sokra
2828

29-
---
30-
This product has relied on ASTExplorer that is licensed under MIT.
31-
3229
---
3330
This product includes code that is based on Ace editor, which was available
3431
under a "BSD" license.

0 commit comments

Comments
 (0)