Skip to content

Commit 25663b7

Browse files
committed
Merge remote-tracking branch 'upstream/master' into remove-code-from-code-owners
2 parents 75ebf9f + aca8ddb commit 25663b7

File tree

357 files changed

+5736
-2064
lines changed

Some content is hidden

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

357 files changed

+5736
-2064
lines changed

.i18nrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"kibana_react": "src/legacy/core_plugins/kibana_react",
2121
"kibana-react": "src/plugins/kibana_react",
2222
"navigation": "src/legacy/core_plugins/navigation",
23+
"newsfeed": "src/plugins/newsfeed",
2324
"regionMap": "src/legacy/core_plugins/region_map",
2425
"server": "src/legacy/server",
2526
"statusPage": "src/legacy/core_plugins/status_page",

docs/setup/settings.asciidoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,10 @@ Kibana reads this url from an external metadata service, but users can still
240240
override this parameter to use their own Tile Map Service. For example:
241241
`"https://tiles.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree&my_app_name=kibana"`
242242

243+
`newsfeed.enabled:` :: *Default: `true`* Controls whether to enable the newsfeed
244+
system for the Kibana UI notification center. Set to `false` to disable the
245+
newsfeed system.
246+
243247
`path.data:`:: *Default: `data`* The path where Kibana stores persistent data
244248
not saved in Elasticsearch.
245249

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@
433433
"pngjs": "^3.4.0",
434434
"postcss": "^7.0.5",
435435
"postcss-url": "^8.0.0",
436-
"prettier": "^1.18.2",
436+
"prettier": "^1.19.1",
437437
"proxyquire": "1.8.0",
438438
"regenerate": "^1.4.0",
439439
"sass-lint": "^1.12.1",

packages/kbn-dev-utils/src/proc_runner/observe_readable.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ import { first, ignoreElements, mergeMap } from 'rxjs/operators';
2929
*/
3030
export function observeReadable(readable: Readable): Rx.Observable<never> {
3131
return Rx.race(
32-
Rx.fromEvent(readable, 'end').pipe(
33-
first(),
34-
ignoreElements()
35-
),
32+
Rx.fromEvent(readable, 'end').pipe(first(), ignoreElements()),
3633

3734
Rx.fromEvent(readable, 'error').pipe(
3835
first(),

packages/kbn-dev-utils/src/tooling_log/tooling_log.test.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,7 @@ describe('#getWritten$()', () => {
112112
const done$ = new Rx.Subject();
113113
const promise = log
114114
.getWritten$()
115-
.pipe(
116-
takeUntil(done$),
117-
toArray()
118-
)
115+
.pipe(takeUntil(done$), toArray())
119116
.toPromise();
120117

121118
log.debug('foo');

packages/kbn-pm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"log-symbols": "^2.2.0",
5151
"ncp": "^2.0.0",
5252
"ora": "^1.4.0",
53-
"prettier": "^1.18.2",
53+
"prettier": "^1.19.1",
5454
"read-pkg": "^5.2.0",
5555
"rxjs": "^6.5.3",
5656
"spawn-sync": "^1.0.15",

packages/kbn-pm/src/commands/bootstrap.test.ts

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,12 @@ test('handles dependencies of dependencies', async () => {
101101
'packages/baz'
102102
);
103103

104-
const projects = new Map([['kibana', kibana], ['foo', foo], ['bar', bar], ['baz', baz]]);
104+
const projects = new Map([
105+
['kibana', kibana],
106+
['foo', foo],
107+
['bar', bar],
108+
['baz', baz],
109+
]);
105110
const projectGraph = buildProjectGraph(projects);
106111

107112
const logMock = jest.spyOn(console, 'log').mockImplementation(noop);
@@ -133,7 +138,10 @@ test('does not run installer if no deps in package', async () => {
133138
'packages/bar'
134139
);
135140

136-
const projects = new Map([['kibana', kibana], ['bar', bar]]);
141+
const projects = new Map([
142+
['kibana', kibana],
143+
['bar', bar],
144+
]);
137145
const projectGraph = buildProjectGraph(projects);
138146

139147
const logMock = jest.spyOn(console, 'log').mockImplementation(noop);
@@ -193,7 +201,10 @@ test('calls "kbn:bootstrap" scripts and links executables after installing deps'
193201
'packages/bar'
194202
);
195203

196-
const projects = new Map([['kibana', kibana], ['bar', bar]]);
204+
const projects = new Map([
205+
['kibana', kibana],
206+
['bar', bar],
207+
]);
197208
const projectGraph = buildProjectGraph(projects);
198209

199210
jest.spyOn(console, 'log').mockImplementation(noop);

packages/kbn-spec-to-console/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"homepage": "https://github.com/jbudz/spec-to-console#readme",
1919
"devDependencies": {
2020
"jest": "^24.9.0",
21-
"prettier": "^1.18.2"
21+
"prettier": "^1.19.1"
2222
},
2323
"dependencies": {
2424
"commander": "^3.0.0",

scripts/functional_tests.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ require('@kbn/test').runTestsCli([
2323
require.resolve('../test/api_integration/config.js'),
2424
require.resolve('../test/plugin_functional/config.js'),
2525
require.resolve('../test/interpreter_functional/config.js'),
26+
require.resolve('../test/ui_capabilities/newsfeed_err/config.ts'),
2627
]);

src/core/public/chrome/nav_links/nav_links_service.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,7 @@ export class NavLinksService {
130130

131131
return {
132132
getNavLinks$: () => {
133-
return navLinks$.pipe(
134-
map(sortNavLinks),
135-
takeUntil(this.stop$)
136-
);
133+
return navLinks$.pipe(map(sortNavLinks), takeUntil(this.stop$));
137134
},
138135

139136
get(id: string) {
@@ -192,7 +189,10 @@ export class NavLinksService {
192189
}
193190

194191
function sortNavLinks(navLinks: ReadonlyMap<string, NavLinkWrapper>) {
195-
return sortBy([...navLinks.values()].map(link => link.properties), 'order');
192+
return sortBy(
193+
[...navLinks.values()].map(link => link.properties),
194+
'order'
195+
);
196196
}
197197

198198
function relativeToAbsolute(url: string) {

0 commit comments

Comments
 (0)