diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-02-02 16:29:40 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-02-02 16:41:39 -0600 |
| commit | ae1d69c29a69412847b6aaa80a04b24932f751d1 (patch) | |
| tree | cde0217ff9edc2bb7fb91c7deedcf1eeb25817c1 | |
| parent | dbcf24c268a4bb9b949a6c94d40a04fc4c56ff90 (diff) | |
| download | gitlab-ce-ae1d69c29a69412847b6aaa80a04b24932f751d1.tar.gz | |
allow application.js to require other scripts which start with application*
| -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 ae81eecfe6a..f3896749476 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -55,7 +55,7 @@ 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('./droplab', false, /^\.\/.*\.(js|es6)$/)); -requireAll(require.context('.', false, /^\.\/(?!application).*\.(js|es6)$/)); +requireAll(require.context('.', false, /^\.\/(?!application\.js).*\.(js|es6)$/)); require('vendor/fuzzaldrin-plus'); window.ES6Promise = require('vendor/es6-promise.auto'); window.ES6Promise.polyfill(); |