Merge remote-tracking branch 'parent/main' into upstream-20241006
This commit is contained in:
commit
66bed31dbe
226 changed files with 2688 additions and 1846 deletions
|
@ -178,8 +178,10 @@ namespace :admin do
|
|||
end
|
||||
|
||||
resources :users, only: [] do
|
||||
resource :two_factor_authentication, only: [:destroy], controller: 'users/two_factor_authentications'
|
||||
resource :role, only: [:show, :update], controller: 'users/roles'
|
||||
scope module: :users do
|
||||
resource :two_factor_authentication, only: [:destroy]
|
||||
resource :role, only: [:show, :update]
|
||||
end
|
||||
end
|
||||
|
||||
resources :custom_emojis, only: [:index, :new, :create, :edit, :update] do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue