Skip to content

Commit 101ff24

Browse files
kertalkertal
committed
Merge master/fix conflicts
2 parents f7d6b4b + ae07038 commit 101ff24

1,025 files changed

Lines changed: 27537 additions & 20128 deletions

File tree

Some content is hidden

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

‎.ci/end2end.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pipeline {
4141
// Filter when to run based on the below reasons:
4242
// - On a PRs when:
4343
// - There are changes related to the APM UI project
44-
// - only when the owners of those changes are members of the apm-ui team (new filter)
44+
// - only when the owners of those changes are members of the given GitHub teams
4545
// - On merges to branches when:
4646
// - There are changes related to the APM UI project
4747
// - FORCE parameter is set to true.
@@ -51,7 +51,7 @@ pipeline {
5151
apm_updated = isGitRegionMatch(patterns: [ "^x-pack/plugins/apm/.*" ])
5252
}
5353
if (isPR()) {
54-
def isMember = isMemberOf(user: env.CHANGE_AUTHOR, team: 'apm-ui')
54+
def isMember = isMemberOf(user: env.CHANGE_AUTHOR, team: ['apm-ui', 'uptime'])
5555
setEnvVar('RUN_APM_E2E', params.FORCE || (apm_updated && isMember))
5656
} else {
5757
setEnvVar('RUN_APM_E2E', params.FORCE || apm_updated)

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
# Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
8686
/src/legacy/core_plugins/kibana/public/home/*.ts @elastic/kibana-core-ui
8787
/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-core-ui
88+
/x-pack/plugins/global_search_bar/ @elastic/kibana-core-ui
8889

8990
# Observability UIs
9091
/x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
@@ -169,6 +170,7 @@
169170
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
170171
/x-pack/plugins/security/ @elastic/kibana-security
171172
/x-pack/test/api_integration/apis/security/ @elastic/kibana-security
173+
/x-pack/test/ui_capabilities/ @elastic/kibana-security
172174
/x-pack/test/encrypted_saved_objects_api_integration/ @elastic/kibana-security
173175
/x-pack/test/functional/apps/security/ @elastic/kibana-security
174176
/x-pack/test/kerberos_api_integration/ @elastic/kibana-security

0 commit comments

Comments
 (0)