djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid loading rails-ujs twice on vanilla flavour

This commit is contained in:
Thibaut Girka 2018-07-16 16:42:52 +02:00
parent f26f1145ac
commit bcf157a1a9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/core/common.js
View File

@ -1,8 +1,5 @@
// This file will be loaded on all pages, regardless of theme. // This file will be loaded on all pages, regardless of theme.
import { start } from 'rails-ujs';
import 'font-awesome/css/font-awesome.css'; import 'font-awesome/css/font-awesome.css';
require.context('../images/', true); require.context('../images/', true);
start();

4
app/javascript/flavours/glitch/packs/common.js
View File

@ -1,3 +1,7 @@
import { start } from 'rails-ujs';
start();
import 'flavours/glitch/styles/index.scss'; import 'flavours/glitch/styles/index.scss';
// This ensures that webpack compiles our images. // This ensures that webpack compiles our images.