From 947dcfba372278f1d6e9fe3437d3f4199a79a530 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Mon, 13 Feb 2017 23:25:34 -0600
Subject: Use es6-promise package to avoid webpack warnings

See https://github.com/stefanpenner/es6-promise/issues/100

```
[WDS] Warnings while compiling.
./vendor/assets/javascripts/es6-promise.auto.js
Module not found: Error: Can't resolve 'vertx' in
'/Users/eric/Documents/gitlab/gitlab-development-kit/gitlab/vendor/assets/javascripts'
 @ ./vendor/assets/javascripts/es6-promise.auto.js 140:16-26
 @ ./app/assets/javascripts/application.js
 @ multi (webpack)-dev-server/client?http://localhost:3808
./application.js
```
---
 app/assets/javascripts/application.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/assets/javascripts/application.js')

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index c9612784f9b..4b5c9686cab 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -56,8 +56,7 @@ requireAll(require.context('./u2f',        false, /^\.\/.*\.(js|es6)$/));
 requireAll(require.context('./droplab',    false, /^\.\/.*\.(js|es6)$/));
 requireAll(require.context('.',            false, /^\.\/(?!application\.js).*\.(js|es6)$/));
 require('vendor/fuzzaldrin-plus');
-window.ES6Promise = require('vendor/es6-promise.auto');
-window.ES6Promise.polyfill();
+require('es6-promise').polyfill();
 
 (function () {
   document.addEventListener('beforeunload', function () {
-- 
cgit v1.2.1