summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2017-02-24 18:49:16 +0000
committerAlfredo Sumaran <alfredo@gitlab.com>2017-02-24 18:49:16 +0000
commit40b81cfafc8b25ec7bd2b7f43872e349bd7b4248 (patch)
tree7de0b64cce3ecf2166a95d0821a462dda6407328
parent52ceaa2406d48151c4158efd46032767bdd8ad1c (diff)
parent08f08a34cfa4d0afe78f8c8afda16693bb96da45 (diff)
downloadgitlab-ce-40b81cfafc8b25ec7bd2b7f43872e349bd7b4248.tar.gz
Merge branch 'remove-require-context-users-bundle' into 'master'
Remove require.context from users_bundle See merge request !9496
-rw-r--r--app/assets/javascripts/users/users_bundle.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/users/users_bundle.js b/app/assets/javascripts/users/users_bundle.js
index 4cad60a59b1..580e2d84be5 100644
--- a/app/assets/javascripts/users/users_bundle.js
+++ b/app/assets/javascripts/users/users_bundle.js
@@ -1,3 +1 @@
-// require everything else in this directory
-function requireAll(context) { return context.keys().map(context); }
-requireAll(require.context('.', false, /^\.\/(?!users_bundle).*\.(js|es6)$/));
+require('./calendar');