Merge branch 'master' into glitch-soc/merge-upstream

Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/tasks/emojis.rake b/lib/tasks/emojis.rake
index 625a6e55d..892afd898 100644
--- a/lib/tasks/emojis.rake
+++ b/lib/tasks/emojis.rake
@@ -15,7 +15,7 @@ end
 namespace :emojis do
   desc 'Generate a unicode to filename mapping'
   task :generate do
-    source = 'http://www.unicode.org/Public/emoji/5.0/emoji-test.txt'
+    source = 'http://www.unicode.org/Public/emoji/11.0/emoji-test.txt'
     codes  = []
     dest   = Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json')
 
@@ -43,6 +43,8 @@ namespace :emojis do
     existence_maps.each do |group|
       existing_one = group.key(true)
 
+      next if existing_one.nil?
+
       group.each_key do |key|
         map[codepoints_to_unicode(key)] = codepoints_to_filename(existing_one)
       end