Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '75ecc6df068ec2c21b26f05692eb5dfdc35671fa' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2024-12-01 18:57:49 +01:00
parent 64fc79cbc2 75ecc6df06
commit 10a24d67d4
13 changed files with 64 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,8 +19,9 @@
%ol.rules-list
- @rules.each do |rule|
%li
.rules-list__text= rule.text
.rules-list__hint= rule.hint
%button{ type: 'button', aria: { expanded: 'false' } }
.rules-list__text= rule.text
.rules-list__hint= rule.hint
.stacked-actions
- accept_path = @invite_code.present? ? public_invite_url(invite_code: @invite_code, accept: @accept_token) : new_user_registration_path(accept: @accept_token)