diff options
author | Mike Greiling <mike@pixelcog.com> | 2017-01-13 11:27:19 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-01-13 13:03:10 -0500 |
commit | 2ee2daa4b91f255218d6f68befa8395d2c62bb3a (patch) | |
tree | 9cbfdd1d73a7ede84b42697f4e22881402865ce9 /app/assets/javascripts/application.js | |
parent | fc4fcf33bfa3279bb0a81aac8498ada67b5e309b (diff) | |
download | gitlab-ce-2ee2daa4b91f255218d6f68befa8395d2c62bb3a.tar.gz |
more post-merge fixes
Diffstat (limited to 'app/assets/javascripts/application.js')
-rw-r--r-- | app/assets/javascripts/application.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 952b295566e..98042106111 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -54,8 +54,8 @@ requireAll(require.context('./commit', false, /^\.\/.*\.(js|es6)$/)); requireAll(require.context('./extensions', false, /^\.\/.*\.(js|es6)$/)); requireAll(require.context('./lib/utils', false, /^\.\/.*\.(js|es6)$/)); requireAll(require.context('./u2f', false, /^\.\/.*\.(js|es6)$/)); -requireAll(require.context('.', false, /^\.\/(?!application).*\.(js|es6)$/)); requireAll(require.context('./droplab', false, /^\.\/.*\.(js|es6)$/)); +requireAll(require.context('.', false, /^\.\/(?!application).*\.(js|es6)$/)); require('vendor/fuzzaldrin-plus'); window.ES6Promise = require('vendor/es6-promise.auto'); window.ES6Promise.polyfill(); |