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

Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2023-07-30 14:33:28 +02:00
parent 5914dfdd69 cfd50f30bb
commit b2515feb29
38 changed files with 121 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/admin/announcements/index.html.haml
View File

@@ -19,4 +19,3 @@
= render partial: 'announcement', collection: @announcements
= paginate @announcements

1
app/views/admin/custom_emojis/index.html.haml
View File

@@ -82,4 +82,3 @@
= render partial: 'custom_emoji', collection: @custom_emojis, locals: { f: f }
= paginate @custom_emojis

1
app/views/admin/ip_blocks/index.html.haml
View File

@@ -22,4 +22,3 @@
= render partial: 'ip_block', collection: @ip_blocks, locals: { f: f }
= paginate @ip_blocks

1
app/views/admin/relays/index.html.haml
View File

@@ -17,4 +17,3 @@
%th
%tbody
= render @relays

1
app/views/admin/roles/edit.html.haml
View File

@@ -5,4 +5,3 @@
= link_to t('admin.roles.delete'), admin_role_path(@role), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive' if can?(:destroy, @role)
= render partial: 'form'

1
app/views/settings/applications/show.html.haml
View File

@@ -28,4 +28,3 @@
.actions
= f.button :button, t('generic.save_changes'), type: :submit