fix duplicate feature registration and revert timelion change

elastic · Jan 7, 2020 · 372ac82 · 372ac82
1 parent 889a06b
commit 372ac82
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/src/legacy/core_plugins/timelion/public/app.js b/src/legacy/core_plugins/timelion/public/app.js
@@ -515,5 +515,3 @@ app.controller('timelion', function(
 
   init();
 });
-
-require('ui/routes').enable();
diff --git a/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx b/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx
@@ -32,7 +32,6 @@ import { UrlParamsProvider } from '../context/UrlParamsContext';
 import { createStaticIndexPattern } from '../services/rest/index_pattern';
 import { px, unit, units } from '../style/variables';
 import { history } from '../utils/history';
-import { featureCatalogueEntry } from './featureCatalogueEntry';
 import { getConfigFromInjectedMetadata } from './getConfigFromInjectedMetadata';
 import { setHelpExtension } from './setHelpExtension';
 import { toggleAppLinkInNav } from './toggleAppLinkInNav';
@@ -93,7 +92,6 @@ export class ApmPlugin
 
   // Take the DOM element as the constructor, so we can mount the app.
   public setup(_core: CoreSetup, plugins: ApmPluginSetupDeps) {
-    plugins.home.featureCatalogue.register(featureCatalogueEntry);
     this.setupPlugins = plugins;
   }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -515,5 +515,3 @@ app.controller('timelion', function(

		init();
		});

		require('ui/routes').enable();