diff options
author | ThibG <thib@sitedethib.com> | 2018-07-17 21:54:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-17 21:54:12 +0200 |
commit | 012ca4c68d785dcf13e4cabd16b09a844e622f6b (patch) | |
tree | 106543bbde5ca7a43920ae13928d9ead0075e88b /app/javascript/core | |
parent | 8e8491e1dab5e2ed98770710e0a32484de8530b3 (diff) | |
parent | bcf157a1a9597595c61b1cce84bd62f63fcaa90b (diff) |
Merge pull request #578 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/core')
-rw-r--r-- | app/javascript/core/admin.js | 3 | ||||
-rw-r--r-- | app/javascript/core/common.js | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/core/admin.js b/app/javascript/core/admin.js index 28f27fbc6..3302454ab 100644 --- a/app/javascript/core/admin.js +++ b/app/javascript/core/admin.js @@ -1,6 +1,9 @@ // This file will be loaded on admin pages, regardless of theme. import { delegate } from 'rails-ujs'; +import { start } from '../mastodon/common'; + +start(); function handleDeleteStatus(event) { const [data] = event.detail; diff --git a/app/javascript/core/common.js b/app/javascript/core/common.js index a7073ef0e..3b038ca40 100644 --- a/app/javascript/core/common.js +++ b/app/javascript/core/common.js @@ -1,8 +1,5 @@ // This file will be loaded on all pages, regardless of theme. -import { start } from 'rails-ujs'; import 'font-awesome/css/font-awesome.css'; require.context('../images/', true); - -start(); |