Conversation
|
Is this also the case for 👎 ? |
|
@ThePsionic 👎 hasn't been broken |
|
☔ The latest upstream changes (presumably d35d47b) made this pull request unmergeable. Please resolve the merge conflicts. |
|
no idea why my push caused a conflict? |
Wolvan
force-pushed
the
bugs/messaging_tweaks/fix_+1_emoji
branch
from
53b31ed to
15db7c0
Compare
|
It was a version conflict, but whatever, I rebased so it's fixed |
|
The merge conflict notification works by detecting the transition from The real cause that made this PR unmergeable seems to be 928b504. |
|
yeah, figured it was something like that. Thanks!
|
|
☔ The latest upstream changes (presumably #864) made this pull request unmergeable. Please resolve the merge conflicts. |
The file of the 👍 emoji is called plus1.png instead of +1.png, which the messaging tweaks has not been taking into account. This is fixed by simply setting the emoji_url to the proper url instead of the generated one. Furthermore, the text to be replaced had to be adjusted as well, since `+` is a special character in RegEx and does not automatically get escaped by `new RegExp`
Wolvan
force-pushed
the
bugs/messaging_tweaks/fix_+1_emoji
branch
from
15db7c0 to
fa117ac
Compare
|
Tested locally, 👍 |
|
📌 Commit fa117ac has been approved by |
…injk Fix broken 👍 emoji The file of the 👍 emoji is called plus1.png instead of +1.png, which the messaging tweaks has not been taking into account. This is fixed by simply setting the emoji_url to the proper url instead of the generated one. Furthermore, the text to be replaced had to be adjusted as well, since `+` is a special character in RegEx and does not automatically get escaped by `new RegExp`
|
☀️ Test successful - status |
7 participants
The file of the 👍 emoji is called plus1.png instead of +1.png, which
the messaging tweaks has not been taking into account. This is fixed by
simply setting the emoji_url to the proper url instead of the generated
one. Furthermore, the text to be replaced had to be adjusted as well,
since
+is a special character in RegEx and does not automatically getescaped by
new RegExp