diff options
| author | nullkal <nullkal@nil.nu> | 2017-10-27 23:11:30 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-10-27 16:11:30 +0200 |
| commit | 781105293cf129c84ef0b91ec8cd27b7127cf951 (patch) | |
| tree | 719dbf46e7aa62a8fc552f3c1f91d4a6b3e0e658 /config | |
| parent | 0cb329f63a292598ef9ed1af6b8f8b56658e7984 (diff) | |
Feature: Unlisted custom emojis (#5485)
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 4 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 45929e97d..2d821550a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -130,11 +130,15 @@ en: enable: Enable enabled_msg: Successfully enabled that emoji image_hint: PNG up to 50KB + listed: Listed new: title: Add new custom emoji shortcode: Shortcode shortcode_hint: At least 2 characters, only alphanumeric characters and underscores title: Custom emojis + unlisted: Unlisted + update_failed_msg: Could not update that emoji + updated_msg: Emoji successfully updated! upload: Upload domain_blocks: add_new: Add new diff --git a/config/routes.rb b/config/routes.rb index 5a6351f77..bdfcdaff6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -140,7 +140,7 @@ Rails.application.routes.draw do resource :two_factor_authentication, only: [:destroy] end - resources :custom_emojis, only: [:index, :new, :create, :destroy] do + resources :custom_emojis, only: [:index, :new, :create, :update, :destroy] do member do post :copy post :enable |