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/routes.rb | |
| parent | 656f5b6f87f2dcb80644edbedc4d2330eb5bee8d (diff) | |
| parent | 781105293cf129c84ef0b91ec8cd27b7127cf951 (diff) | |
Merge branch 'master' into gs-master
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |