jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into feat-eslint

Browse Source
This commit is contained in:
Albert Yi
2018-08-06 10:27:32 -07:00
committed by GitHub
parent f72b32b27b 773bbabac7
commit fd8568c726
4 changed files with 7 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/packs/application.js
View File

@@ -30,7 +30,7 @@ importAll(require.context('../src/javascripts', true, /\.js(\.erb)?$/));
importAll(require.context('../src/styles/common', true, /\.scss(?:\.erb)?$/));
importAll(require.context('../src/styles/specific', true, /\.scss(?:\.erb)?$/));
// export { default as Autocomplete } from '../src/javascripts/autocomplete.js.erb';
export { default as Autocomplete } from '../src/javascripts/autocomplete.js.erb';
export { default as Blacklist } from '../src/javascripts/blacklists.js';
export { default as Comment } from '../src/javascripts/comments.js';
export { default as Dtext } from '../src/javascripts/dtext.js';
@@ -38,3 +38,4 @@ export { default as Note } from '../src/javascripts/notes.js';
export { default as PostModeMenu } from '../src/javascripts/post_mode_menu.js';
export { default as Utility } from '../src/javascripts/utility.js';
export { default as Ugoira } from '../src/javascripts/ugoira.js';
export { default as TagScript } from '../src/javascripts/tag_script.js';