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

2023-07-30 14:33:28 +02:00
parent 5914dfdd69 cfd50f30bb
commit b2515feb29
38 changed files with 121 additions and 94 deletions
@@ -19,4 +19,3 @@
    = render partial: 'announcement', collection: @announcements

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

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

 = paginate @ip_blocks
-
@@ -17,4 +17,3 @@
          %th
      %tbody
        = render @relays
-
@@ -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'
-