Feature: Unlisted custom emojis (#5485) (78110529) · Commits · liberty / host / Smilodon · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Smilodon
- Activity
- Members
- Labels
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this page for instructions on how to get full permissions. Sorry for the inconvenience.

Admin message

source.puri.sm migrated to a new server, see new ssh key fingerprint.

78110529

Commit 78110529 authored 7 years ago by nullkal Committed by Eugen Rochko 7 years ago

Downloads
- Patches
- Plain Diff

Feature: Unlisted custom emojis (#5485)

parent 0cb329f6

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/admin/custom_emojis_controller.rb 9 additions, 1 deletion

app/controllers/admin/custom_emojis_controller.rb
app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js 1 addition, 1 deletion

...res/compose/containers/emoji_picker_dropdown_container.js
app/models/custom_emoji.rb 1 addition, 0 deletions

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

app/serializers/rest/custom_emoji_serializer.rb
app/views/admin/custom_emojis/_custom_emoji.html.haml 6 additions, 1 deletion

app/views/admin/custom_emojis/_custom_emoji.html.haml
config/locales/en.yml 4 additions, 0 deletions

config/locales/en.yml
config/routes.rb 1 addition, 1 deletion

config/routes.rb
db/migrate/20171020084748_add_visible_in_picker_to_custom_emoji.rb 7 additions, 0 deletions

...e/20171020084748_add_visible_in_picker_to_custom_emoji.rb
db/schema.rb 2 additions, 1 deletion

db/schema.rb

with 32 additions and 6 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