Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

mastofe
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

b9c76e2e

Commit b9c76e2e authored 7 years ago by Eugen Rochko Committed by GitHub 7 years ago

Downloads
- Patches
- Plain Diff

When processing custom emoji, ensure a non-animated version exists (#5230)

Use the non-animated version in web UI, but return both in API

parent 2559d916

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/javascript/mastodon/emoji.js 1 addition, 1 deletion

app/javascript/mastodon/emoji.js
app/javascript/mastodon/reducers/statuses.js 1 addition, 1 deletion

app/javascript/mastodon/reducers/statuses.js
app/lib/formatter.rb 1 addition, 1 deletion

app/lib/formatter.rb
app/models/custom_emoji.rb 1 addition, 1 deletion

app/models/custom_emoji.rb
app/serializers/rest/custom_emoji_serializer.rb 5 additions, 1 deletion

app/serializers/rest/custom_emoji_serializer.rb

with 9 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment