diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-24 19:49:26 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-24 19:49:26 +0000 |
| commit | f351f8214e3e4fef2d9d4c9ce3649fd8a5316b67 (patch) | |
| tree | e53b7316907120c3ed0d31a0c069a61c82b4a74c | |
| parent | 6bbb8efa36b04e83a0374787f38d092ce2840576 (diff) | |
| parent | 25818010b6df75409caad46f20b1c40370357e4e (diff) | |
| download | gitlab-ce-f351f8214e3e4fef2d9d4c9ce3649fd8a5316b67.tar.gz | |
Merge branch 'remove-require-context-profile-bundle' into 'master'
Remove require.context from profile_bundle
See merge request !9492
| -rw-r--r-- | app/assets/javascripts/profile/profile_bundle.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/profile/profile_bundle.js b/app/assets/javascripts/profile/profile_bundle.js index d7f3c9fd37e..15d32825583 100644 --- a/app/assets/javascripts/profile/profile_bundle.js +++ b/app/assets/javascripts/profile/profile_bundle.js @@ -1,3 +1,2 @@ -// require everything else in this directory -function requireAll(context) { return context.keys().map(context); } -requireAll(require.context('.', false, /^\.\/(?!profile_bundle).*\.(js|es6)$/)); +require('./gl_crop'); +require('./profile'); |