Merge branch 'master' into glitch-soc/merge-upstream

2019-03-28 18:35:25 +01:00
parent bb316fafff 58667072d9
commit ce7d055d3c
26 changed files with 299 additions and 31 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -366,6 +366,7 @@ Rails.application.routes.draw do
        resources :followers, only: :index, controller: 'accounts/follower_accounts'
        resources :following, only: :index, controller: 'accounts/following_accounts'
        resources :lists, only: :index, controller: 'accounts/lists'
+        resources :identity_proofs, only: :index, controller: 'accounts/identity_proofs'

        member do
          post :follow