tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
This commit is contained in:
Claire
2022-11-14 08:35:55 +01:00
parent 81b1d32d5b b59ce0a60f
commit 32c70d2f09
171 changed files with 1816 additions and 1092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/settings/registrations/show.html.haml
View File

@ -5,7 +5,7 @@
%h2= t('admin.settings.title')
= render partial: 'admin/settings/shared/links'
= simple_form_for @admin_settings, url: admin_settings_branding_path, html: { method: :patch } do |f|
= simple_form_for @admin_settings, url: admin_settings_registrations_path, html: { method: :patch } do |f|
= render 'shared/error_messages', object: @admin_settings
%p.lead= t('admin.settings.registrations.preamble')