summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/protected_branches
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2016-11-03 16:38:54 -0500
committerMike Greiling <mike@pixelcog.com>2017-01-10 12:30:38 -0600
commitfe964cc235ed22a5d013d5874284763b698aba7c (patch)
tree5529dd7d9deb13d511d37f7a8fed33de15aa6d7c /app/assets/javascripts/protected_branches
parent55f291e8ceae6d3d432039f72f6935c62fb2a872 (diff)
downloadgitlab-ce-fe964cc235ed22a5d013d5874284763b698aba7c.tar.gz
migrate all javascript asset bundles and require syntax
Diffstat (limited to 'app/assets/javascripts/protected_branches')
-rw-r--r--app/assets/javascripts/protected_branches/protected_branches_bundle.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/protected_branches/protected_branches_bundle.js b/app/assets/javascripts/protected_branches/protected_branches_bundle.js
index 15b3affd469..ffb66caf5f4 100644
--- a/app/assets/javascripts/protected_branches/protected_branches_bundle.js
+++ b/app/assets/javascripts/protected_branches/protected_branches_bundle.js
@@ -1 +1,3 @@
-/*= require_tree . */
+// require everything else in this directory
+function requireAll(context) { return context.keys().map(context); }
+requireAll(require.context('.', false, /^\.\/(?!protected_branches_bundle).*\.(js|es6)$/));