diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-20 13:54:00 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-20 13:54:00 +0100 |
commit | 1d6152f4404d40a6113bad2e70326fb5c2145ef4 (patch) | |
tree | 4edcc500883b3e533c06517b147bf221b06f6bf0 /config/routes.rb | |
parent | b9a998f201913dd1c89ddcb0c4c9e181eb73bfcf (diff) | |
parent | 158c31b9df538691666e5b91f48a0afecd2985fe (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index d521d66ca..24e1f8e16 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -22,6 +22,8 @@ Rails.application.routes.draw do get '.well-known/host-meta', to: 'well_known/host_meta#show', as: :host_meta, defaults: { format: 'xml' } get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger get '.well-known/change-password', to: redirect('/auth/edit') + get '.well-known/keybase-proof-config', to: 'well_known/keybase_proof_config#show' + get 'manifest', to: 'manifests#show', defaults: { format: 'json' } get 'intent', to: 'intents#show' get 'custom.css', to: 'custom_css#show', as: :custom_css @@ -107,6 +109,8 @@ Rails.application.routes.draw do resource :confirmation, only: [:new, :create] end + resources :identity_proofs, only: [:index, :show, :new, :create, :update] + resources :applications, except: [:edit] do member do post :regenerate @@ -251,6 +255,9 @@ Rails.application.routes.draw do # OEmbed get '/oembed', to: 'oembed#show', as: :oembed + # Identity proofs + get :proofs, to: 'proofs#index' + # JSON / REST API namespace :v1 do resources :statuses, only: [:create, :show, :destroy] do |