diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-10-27 09:45:25 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-10-27 09:45:25 -0500 |
| commit | 870d71b78be74b7fab4892a79a87aff39b1e2726 (patch) | |
| tree | 0628116973b67c573509f8affe50cc3d6c9a6f4f /config | |
| parent | 656f5b6f87f2dcb80644edbedc4d2330eb5bee8d (diff) | |
| parent | 781105293cf129c84ef0b91ec8cd27b7127cf951 (diff) | |
Merge branch 'master' into gs-master
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 7d46df327..d5c46470c 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 d01489725..aca613ed2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -147,7 +147,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 |