diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-22 18:02:39 +0000 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-22 18:02:39 +0000 |
commit | af7402ea5777e4c3e9573c6363db1181a789eb71 (patch) | |
tree | 56b15af374fb7653b4aa1668081f5ceab3c4fbc7 /app | |
parent | 7273745e33a4f2a8f0c7c9d3a31f0f6164230ef4 (diff) | |
parent | 8ba08213a16aaa9d00b5d7df308212550d90d28e (diff) | |
download | gitlab-ce-af7402ea5777e4c3e9573c6363db1181a789eb71.tar.gz |
Merge branch 'remove-require-context-diff-notes-bundle' into 'master'
Remove require.context from diff_notes_bundle
See merge request !9394
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6 | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6 b/app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6 index 190461451d5..cadf8b96b87 100644 --- a/app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6 +++ b/app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6 @@ -1,14 +1,18 @@ -/* eslint-disable func-names, comma-dangle, new-cap, no-new, import/newline-after-import, no-multi-spaces, max-len */ +/* eslint-disable func-names, comma-dangle, new-cap, no-new, max-len */ /* global Vue */ /* global ResolveCount */ -function requireAll(context) { return context.keys().map(context); } const Vue = require('vue'); -requireAll(require.context('./models', false, /^\.\/.*\.(js|es6)$/)); -requireAll(require.context('./stores', false, /^\.\/.*\.(js|es6)$/)); -requireAll(require.context('./services', false, /^\.\/.*\.(js|es6)$/)); -requireAll(require.context('./mixins', false, /^\.\/.*\.(js|es6)$/)); -requireAll(require.context('./components', false, /^\.\/.*\.(js|es6)$/)); +require('./models/discussion'); +require('./models/note'); +require('./stores/comments'); +require('./services/resolve'); +require('./mixins/discussion'); +require('./components/comment_resolve_btn'); +require('./components/jump_to_discussion'); +require('./components/resolve_btn'); +require('./components/resolve_count'); +require('./components/resolve_discussion_btn'); $(() => { const projectPath = document.querySelector('.merge-request').dataset.projectPath; |