about summary refs log tree commit diff
path: root/app/views/auth
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-10-30 19:35:59 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-10-30 19:35:59 +0100
commit5fd758fad18830e9e4b7baeccd87977397cf824a (patch)
tree059d44dd865528c2721eef9cf7ef990d23f2f1a3 /app/views/auth
parent8048874a3a62abab052d769b7fcae1c2c947e398 (diff)
parenta529d6d93e777003019f1ab0d7ff913134625cf6 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/views/auth')
-rw-r--r--app/views/auth/registrations/rules.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/auth/registrations/rules.html.haml b/app/views/auth/registrations/rules.html.haml
index a41581b32..8e7a90cbe 100644
--- a/app/views/auth/registrations/rules.html.haml
+++ b/app/views/auth/registrations/rules.html.haml
@@ -14,7 +14,8 @@
         .rules-list__text= rule.text
 
   .stacked-actions
-    = link_to t('auth.rules.accept'), new_user_registration_path(accept: @accept_token), class: 'button'
+    - accept_path = @invite_code.present? ? public_invite_url(invite_code: @invite_code, accept: @accept_token) : new_user_registration_path(accept: @accept_token)
+    = link_to t('auth.rules.accept'), accept_path, class: 'button'
     = link_to t('auth.rules.back'), root_path, class: 'button button-tertiary'
 
 .form-footer= render 'auth/shared/links'