erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Merge 1cdffd2396 into a50c8e951f

Browse source
This commit is contained in:
Matt Jankowski 2024-07-31 14:07:11 +00:00 committed by GitHub
commit e1dc5320cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/routes/admin.rb
View file

@ -144,8 +144,10 @@ namespace :admin do
end end
resources :users, only: [] do resources :users, only: [] do
resource :two_factor_authentication, only: [:destroy], controller: 'users/two_factor_authentications' scope module: :users do
resource :role, only: [:show, :update], controller: 'users/roles' resource :two_factor_authentication, only: [:destroy]
resource :role, only: [:show, :update]
end
end end
resources :custom_emojis, only: [:index, :new, :create] do resources :custom_emojis, only: [:index, :new, :create] do