summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-01-13 19:49:14 -0500
committerMike Greiling <mike@pixelcog.com>2017-01-13 19:49:14 -0500
commit55fc4e8fd88e3ac813ba87ef6ec8f2d73354520d (patch)
tree5601e37f9056698756d4e2675687bb7c413ec2ad
parent6ad01a49d478460905da4596ad22061fa85d6873 (diff)
downloadgitlab-ce-55fc4e8fd88e3ac813ba87ef6ec8f2d73354520d.tar.gz
fix requireAll within filtered search bundle
-rw-r--r--app/assets/javascripts/filtered_search/filtered_search_bundle.js10
1 files changed, 2 insertions, 8 deletions
diff --git a/app/assets/javascripts/filtered_search/filtered_search_bundle.js b/app/assets/javascripts/filtered_search/filtered_search_bundle.js
index b4186f8376a..392f1835966 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_bundle.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_bundle.js
@@ -1,9 +1,3 @@
- // This is a manifest file that'll be compiled into including all the files listed below.
- // Add new JavaScript code in separate files in this directory and they'll automatically
- // be included in the compiled file accessible from http://example.com/assets/application.js
- // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
- // the compiled file.
- //
- function requireAll(context) { return context.keys().map(context); }
+function requireAll(context) { return context.keys().map(context); }
- requireAll(require.context('./', true, /^\.\/.*\.(js|es6)$/));
+requireAll(require.context('./', true, /^\.\/(?!filtered_search_bundle).*\.(js|es6)$/));