Merge branch 'chore/update_dependencies' into bugfix/local_web_app_icons
This commit is contained in:
@@ -325,3 +325,10 @@ Devise.setup do |config|
|
||||
# changed. Defaults to true, so a user is signed in automatically after changing a password.
|
||||
# config.sign_in_after_change_password = true
|
||||
end
|
||||
|
||||
# https://github.com/heartcombo/devise/issues/5644
|
||||
class Devise::SecretKeyFinder
|
||||
def find
|
||||
@application.secret_key_base
|
||||
end
|
||||
end
|
||||
|
||||
@@ -73,9 +73,19 @@ Rails.application.routes.draw do
|
||||
namespace :admin do
|
||||
root to: 'dashboard#index'
|
||||
|
||||
resources 'users', param: 'address', only: ['index', 'show'], constraints: { address: /.*/ }
|
||||
resources 'users', param: 'username', only: ['index', 'show'] do
|
||||
member do
|
||||
post 'invitations', to: 'users#create_invitations'
|
||||
delete 'invitations', to: 'users#delete_invitations'
|
||||
end
|
||||
end
|
||||
|
||||
# post 'users/:username/invitations', to: 'users#create_invitations'
|
||||
|
||||
get 'invitations', to: 'invitations#index'
|
||||
|
||||
resources :donations
|
||||
|
||||
get 'lightning', to: 'lightning#index'
|
||||
|
||||
namespace :app_catalog do
|
||||
|
||||
Reference in New Issue
Block a user