Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream

2023-06-18 10:36:14 +02:00
parent fefdc3244c 39110d1d0a
commit 65cbcce997
76 changed files with 2108 additions and 1483 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -68,6 +68,8 @@ Rails.application.routes.draw do
  devise_scope :user do
    get '/invite/:invite_code', to: 'auth/registrations#new', as: :public_invite

+    resource :unsubscribe, only: [:show, :create], controller: :mail_subscriptions
+
    namespace :auth do
      resource :setup, only: [:show, :update], controller: :setup
      resource :challenge, only: [:create], controller: :challenges