]> cat aescling's git repositories - mastodon.git/commit
Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
authornullkal <nullkal@nil.nu>
Tue, 7 Nov 2017 13:49:32 +0000 (22:49 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Tue, 7 Nov 2017 13:49:32 +0000 (14:49 +0100)
commitb6e2e999bd4c603bc36b1234af484184644104e9
treef1aa9fc571fc656780e9b22a2c1dccb3f521997c
parent782224c99151665470b138add583d50df17b4380
 Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)

* Show the local couterpart of emoji when it exists in admin/custom_emojis

* Fix indentation

* Fix error

* Add class table-action-link to Overwrite link

* Make it enable to overwrite emojis

* Make Code Climate happy
app/controllers/admin/custom_emojis_controller.rb
app/helpers/application_helper.rb
app/models/custom_emoji.rb
app/views/admin/custom_emojis/_custom_emoji.html.haml
config/brakeman.ignore
config/locales/en.yml