diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-23 00:04:04 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-23 00:04:04 +0000 |
| commit | ca9d303db735d4a70d906745bf3ce5e479473d2e (patch) | |
| tree | 201d68d89bf608cd13dd773d81b32c0159f79bfc | |
| parent | 52795c40e4c71880d0187dabaf9698e2d70b0d48 (diff) | |
| parent | f326e6fb8d806ba443c64965a564d64a2f313a19 (diff) | |
| download | gitlab-ce-ca9d303db735d4a70d906745bf3ce5e479473d2e.tar.gz | |
Merge branch 'remove-require-context-network-bundle' into 'master'
Remove require.context from network_bundle
See merge request !9458
| -rw-r--r-- | app/assets/javascripts/network/network_bundle.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/network/network_bundle.js b/app/assets/javascripts/network/network_bundle.js index aae509caa79..e5947586583 100644 --- a/app/assets/javascripts/network/network_bundle.js +++ b/app/assets/javascripts/network/network_bundle.js @@ -2,9 +2,8 @@ /* global Network */ /* global ShortcutsNetwork */ -// require everything else in this directory -function requireAll(context) { return context.keys().map(context); } -requireAll(require.context('.', false, /^\.\/(?!network_bundle).*\.(js|es6)$/)); +require('./branch_graph'); +require('./network'); (function() { $(function() { |