Merge pull request #7743 from ycombinator/backport/hacks-to-4.x

Backport hacks to 4.x
elastic · Jul 14, 2016 · 22ef18a · 22ef18a
2 parents 408f684 + de925f2
commit 22ef18a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/ui/UiApp.js b/src/ui/UiApp.js
@@ -32,7 +32,7 @@ class UiApp {
     return _.chain([
       this.autoloadOverrides || autoload.require,
       this.uiExports.find(_.get(this, 'spec.uses', [])),
-      this.uiExports.find(['chromeNavControls']),
+      this.uiExports.find(['chromeNavControls', 'hacks']),
     ])
     .flatten()
     .uniq()

diff --git a/src/ui/UiExports.js b/src/ui/UiExports.js
@@ -70,6 +70,7 @@ class UiExports {
       case 'chromeNavControls':
       case 'navbarExtensions':
       case 'settingsSections':
+      case 'hacks':
         return (plugin, spec) => {
           this.aliases[type] = _.union(this.aliases[type] || [], spec);
         };