diff --git a/lib/emoji/db.json b/lib/emoji/db.json index efbf74363a8..fd5be3b0491 100644 --- a/lib/emoji/db.json +++ b/lib/emoji/db.json @@ -829,7 +829,7 @@ "name": "woman_facepalming" }, { - "code": "1f937", + "code": "1f937-200d-2640-fe0f", "name": "woman_shrugging" }, { diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake index 2ffc1ca4a56..a5047cc5b71 100644 --- a/lib/tasks/emoji.rake +++ b/lib/tasks/emoji.rake @@ -1753,6 +1753,7 @@ EMOJI_KEYWORDS_PATCH ||= { "walking_woman" => { "fitzpatrick_scale" => true }, "woman_facepalming" => { "fitzpatrick_scale" => true }, "bowing_woman" => { "fitzpatrick_scale" => true }, + "woman_shrugging" => { "char" => "🤷‍♀️" }, "man_shrugging" => { "fitzpatrick_scale" => true }, "tipping_hand_man" => { "fitzpatrick_scale" => true }, "no_good_man" => { "fitzpatrick_scale" => true }, diff --git a/public/images/emoji/twitter/woman_shrugging/2.png b/public/images/emoji/twitter/woman_shrugging/2.png index 17e41e4d718..3ae10f1008d 100644 Binary files a/public/images/emoji/twitter/woman_shrugging/2.png and b/public/images/emoji/twitter/woman_shrugging/2.png differ diff --git a/public/images/emoji/twitter/woman_shrugging/3.png b/public/images/emoji/twitter/woman_shrugging/3.png index 08215923ebf..1be387d41e1 100644 Binary files a/public/images/emoji/twitter/woman_shrugging/3.png and b/public/images/emoji/twitter/woman_shrugging/3.png differ diff --git a/public/images/emoji/twitter/woman_shrugging/4.png b/public/images/emoji/twitter/woman_shrugging/4.png index c29ab2f743a..9fbf38dfeab 100644 Binary files a/public/images/emoji/twitter/woman_shrugging/4.png and b/public/images/emoji/twitter/woman_shrugging/4.png differ diff --git a/public/images/emoji/twitter/woman_shrugging/5.png b/public/images/emoji/twitter/woman_shrugging/5.png index 8ebe5b703d0..349d86171e0 100644 Binary files a/public/images/emoji/twitter/woman_shrugging/5.png and b/public/images/emoji/twitter/woman_shrugging/5.png differ diff --git a/public/images/emoji/twitter/woman_shrugging/6.png b/public/images/emoji/twitter/woman_shrugging/6.png index 27717066d7a..82a2b9f0528 100644 Binary files a/public/images/emoji/twitter/woman_shrugging/6.png and b/public/images/emoji/twitter/woman_shrugging/6.png differ diff --git a/public/images/emoji/win10/woman_shrugging.png b/public/images/emoji/win10/woman_shrugging.png index 0e2de80b796..d71e99459a2 100644 Binary files a/public/images/emoji/win10/woman_shrugging.png and b/public/images/emoji/win10/woman_shrugging.png differ diff --git a/public/images/emoji/win10/woman_shrugging/2.png b/public/images/emoji/win10/woman_shrugging/2.png index e6284fc6c65..25dc818cb87 100644 Binary files a/public/images/emoji/win10/woman_shrugging/2.png and b/public/images/emoji/win10/woman_shrugging/2.png differ diff --git a/public/images/emoji/win10/woman_shrugging/3.png b/public/images/emoji/win10/woman_shrugging/3.png index f31d120f3dd..9211df35184 100644 Binary files a/public/images/emoji/win10/woman_shrugging/3.png and b/public/images/emoji/win10/woman_shrugging/3.png differ diff --git a/public/images/emoji/win10/woman_shrugging/4.png b/public/images/emoji/win10/woman_shrugging/4.png index 374dff4504b..b241a786e67 100644 Binary files a/public/images/emoji/win10/woman_shrugging/4.png and b/public/images/emoji/win10/woman_shrugging/4.png differ diff --git a/public/images/emoji/win10/woman_shrugging/5.png b/public/images/emoji/win10/woman_shrugging/5.png index 9cf70f36bfb..ba257bbef2a 100644 Binary files a/public/images/emoji/win10/woman_shrugging/5.png and b/public/images/emoji/win10/woman_shrugging/5.png differ diff --git a/public/images/emoji/win10/woman_shrugging/6.png b/public/images/emoji/win10/woman_shrugging/6.png index aadb906f445..696194810c7 100644 Binary files a/public/images/emoji/win10/woman_shrugging/6.png and b/public/images/emoji/win10/woman_shrugging/6.png differ diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index 8664d2178f2..62e495c2a88 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -458,6 +458,7 @@ HTML expect(PrettyText.cook("hello 👱🏿‍♀️")).to eq("

hello \":blonde_woman:t6:\"

") expect(PrettyText.cook("hello 👩‍🎤")).to eq("

hello \":woman_singer:\"

") expect(PrettyText.cook("hello 👩🏾‍🎓")).to eq("

hello \":woman_student:t5:\"

") + expect(PrettyText.cook("hello 🤷‍♀️")).to eq("

hello \":woman_shrugging:\"

") end end