diff options
author | Shlee <github@shl.ee> | 2020-03-21 10:14:50 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-21 03:14:50 +0100 |
commit | 221eda646b09a5d993a999d000af9de6c7f25b50 (patch) | |
tree | bcfe11e8605c908606d77ef871cb355f798b78fd /app/javascript/packs | |
parent | 44292a6952cfa1e87137eaecbd41269b35105a60 (diff) |
Migrate Rails ujs as required for Rails 6 Upgrade. (#13280)
* Update yarn.lock * Update package.json * Update public.js * Update admin.js * Update log_out.js * Update common.js
Diffstat (limited to 'app/javascript/packs')
-rw-r--r-- | app/javascript/packs/admin.js | 2 | ||||
-rw-r--r-- | app/javascript/packs/public.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/packs/admin.js b/app/javascript/packs/admin.js index b318cadc6..061287f89 100644 --- a/app/javascript/packs/admin.js +++ b/app/javascript/packs/admin.js @@ -1,4 +1,4 @@ -import { delegate } from 'rails-ujs'; +import { delegate } from '@rails/ujs'; import ready from '../mastodon/ready'; const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]'; diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js index 2fb9cb29d..8ba4f6ee0 100644 --- a/app/javascript/packs/public.js +++ b/app/javascript/packs/public.js @@ -25,7 +25,7 @@ window.addEventListener('message', e => { function main() { const IntlMessageFormat = require('intl-messageformat').default; const { timeAgoString } = require('../mastodon/components/relative_timestamp'); - const { delegate } = require('rails-ujs'); + const { delegate } = require('@rails/ujs'); const emojify = require('../mastodon/features/emoji/emoji').default; const { getLocale } = require('../mastodon/locales'); const { messages } = getLocale(); |