Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

mastodon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

45682f87

Commit 45682f87 authored 7 years ago by Eugen Rochko Committed by GitHub 7 years ago

Downloads
- Patches
- Plain Diff

Make auto-play GIFs preference affect custom emojis in web UI (#5254)

parent 4413d81d

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/features/compose/components/emoji_picker_dropdown.js 4 additions, 1 deletion

...odon/features/compose/components/emoji_picker_dropdown.js
app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js 1 addition, 0 deletions

...res/compose/containers/emoji_picker_dropdown_container.js
app/javascript/mastodon/features/emoji/emoji.js 8 additions, 3 deletions

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

app/javascript/mastodon/reducers/custom_emojis.js
app/javascript/mastodon/reducers/statuses.js 3 additions, 2 deletions

app/javascript/mastodon/reducers/statuses.js

with 17 additions and 7 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