diff options
author | David Yip <yipdw@member.fsf.org> | 2017-11-27 11:29:04 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-11-27 11:29:04 -0600 |
commit | e77c3996a513a45e5cad368b0053459f303c60cb (patch) | |
tree | 923411336e4207bb95c17c90c79f19dabb4d62e2 /config/routes.rb | |
parent | 5de42665d77431def632ca8fb8665082027c60a5 (diff) | |
parent | 1c5b0e333464d8da3de73e4886502c816cb8173e (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 6e41f362c..1f95ef3d2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -22,6 +22,10 @@ Rails.application.routes.draw do get 'manifest', to: 'manifests#show', defaults: { format: 'json' } get 'intent', to: 'intents#show' + devise_scope :user do + get '/invite/:invite_code', to: 'auth/registrations#new', as: :public_invite + end + devise_for :users, path: 'auth', controllers: { sessions: 'auth/sessions', registrations: 'auth/registrations', @@ -106,6 +110,7 @@ Rails.application.routes.draw do resources :media, only: [:show] resources :tags, only: [:show] resources :emojis, only: [:show] + resources :invites, only: [:index, :create, :destroy] get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy @@ -119,6 +124,7 @@ Rails.application.routes.draw do resources :email_domain_blocks, only: [:index, :new, :create, :destroy] resources :action_logs, only: [:index] resource :settings, only: [:edit, :update] + resources :invites, only: [:index, :create, :destroy] resources :instances, only: [:index] do collection do |