From dfe8240f8d43effce1064ce26d64313447b2bf61 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 2 Aug 2018 17:22:08 +0200
Subject: [PATCH] Import upstream's emojify function in settings.js

This fixes updating the profile preview when changing display name.
---
 app/javascript/core/settings.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/core/settings.js b/app/javascript/core/settings.js
index 175a1758fb..d727ca996d 100644
--- a/app/javascript/core/settings.js
+++ b/app/javascript/core/settings.js
@@ -2,6 +2,7 @@
 
 const { length } = require('stringz');
 const { delegate } = require('rails-ujs');
+import emojify from '../mastodon/features/emoji/emoji';
 
 delegate(document, '#account_display_name', 'input', ({ target }) => {
   const nameCounter = document.querySelector('.name-counter');