Merge branch 'master' into feature/ln_address_keysend

config/routes.rb

@@ -1,7 +1,7 @@
 require 'sidekiq/web'
 
 Rails.application.routes.draw do
-  devise_for :users
+  devise_for :users, :controllers => { :confirmations => "users/confirmations" }
 
   get 'welcome', to: 'welcome#index'
   get 'check_your_email', to: 'welcome#check_your_email'
@@ -43,7 +43,7 @@ Rails.application.routes.draw do
 
   namespace :admin do
     root to: 'dashboard#index'
-    get 'ldap_users', to: 'ldap_users#index'
+    resources 'users', param: 'address', only: ['index', 'show'], constraints: { address: /.*/ }
     get 'invitations', to: 'invitations#index'
     resources :donations
     get 'lightning', to: 'lightning#index'