hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

rebase/4.0.0rc1
Claire 2022-10-30 19:35:59 +01:00
parent 8048874a3a a529d6d93e
commit 5fd758fad1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/auth/registrations_controller.rb
View File

@ -153,6 +153,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
return if @rules.empty? || (session[:accept_token].present? && params[:accept] == session[:accept_token]) return if @rules.empty? || (session[:accept_token].present? && params[:accept] == session[:accept_token])
@accept_token = session[:accept_token] = SecureRandom.hex @accept_token = session[:accept_token] = SecureRandom.hex
@invite_code = invite_code
set_locale { render :rules } set_locale { render :rules }
end end

3
app/views/auth/registrations/rules.html.haml
View File

@ -14,7 +14,8 @@
.rules-list__text= rule.text .rules-list__text= rule.text
.stacked-actions .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' = link_to t('auth.rules.back'), root_path, class: 'button button-tertiary'
.form-footer= render 'auth/shared/links' .form-footer= render 'auth/shared/links'