From 221eda646b09a5d993a999d000af9de6c7f25b50 Mon Sep 17 00:00:00 2001
From: Shlee <github@shl.ee>
Date: Sat, 21 Mar 2020 10:14:50 +0800
Subject: 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
---
 app/javascript/packs/public.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/javascript/packs/public.js')

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();
-- 
cgit