Merge commit 'f826a95f6e
' into kb_migration
This commit is contained in:
commit
4b65740722
211 changed files with 628 additions and 599 deletions
|
@ -19,4 +19,3 @@
|
|||
= render partial: 'announcement', collection: @announcements
|
||||
|
||||
= paginate @announcements
|
||||
|
||||
|
|
|
@ -91,4 +91,3 @@
|
|||
= render partial: 'custom_emoji', collection: @custom_emojis, locals: { f: f }
|
||||
|
||||
= paginate @custom_emojis
|
||||
|
||||
|
|
|
@ -25,4 +25,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'
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue