Merge branch 'master' into gs-master

2017-10-27 09:45:25 -05:00
parent 656f5b6f87 781105293c
commit 870d71b78b
12 changed files with 88 additions and 44 deletions
--- 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