summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2017-02-24 19:44:59 +0000
committerAlfredo Sumaran <alfredo@gitlab.com>2017-02-24 19:44:59 +0000
commit6bbb8efa36b04e83a0374787f38d092ce2840576 (patch)
tree1d33c063f52b91dd7e07cdc5668ae9031f7448ab
parent679a742f6a37c7aea6fd47f35201124febb7aef0 (diff)
parent1adc59acc1252ed8e18c0299decaf277d361f43d (diff)
downloadgitlab-ce-6bbb8efa36b04e83a0374787f38d092ce2840576.tar.gz
Merge branch 'remove-require-context-protected-branches-bundle' into 'master'
Remove require.context from protected_branches_bundle See merge request !9493
-rw-r--r--app/assets/javascripts/protected_branches/protected_branches_bundle.js8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/protected_branches/protected_branches_bundle.js b/app/assets/javascripts/protected_branches/protected_branches_bundle.js
index ffb66caf5f4..849c1e31623 100644
--- a/app/assets/javascripts/protected_branches/protected_branches_bundle.js
+++ b/app/assets/javascripts/protected_branches/protected_branches_bundle.js
@@ -1,3 +1,5 @@
-// require everything else in this directory
-function requireAll(context) { return context.keys().map(context); }
-requireAll(require.context('.', false, /^\.\/(?!protected_branches_bundle).*\.(js|es6)$/));
+require('./protected_branch_access_dropdown');
+require('./protected_branch_create');
+require('./protected_branch_dropdown');
+require('./protected_branch_edit');
+require('./protected_branch_edit_list');