diff options
author | David Yip <yipdw@member.fsf.org> | 2017-09-09 23:56:21 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-09-09 23:56:21 -0500 |
commit | 67ad4533732f2e5cfc8c7f7ad3abaf7a5eb2647b (patch) | |
tree | 011ea44fc94bcff6f8ec4e23c3edf887359243d2 /app/views/admin/domain_blocks | |
parent | 3dff74eecf5387b92b862893248710d2efb90eec (diff) | |
parent | 90712d42933efd9978e4bbae82f81a4650aa4d84 (diff) |
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss
Diffstat (limited to 'app/views/admin/domain_blocks')
-rw-r--r-- | app/views/admin/domain_blocks/index.html.haml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/app/views/admin/domain_blocks/index.html.haml b/app/views/admin/domain_blocks/index.html.haml index 5ae9fec53..42b8ca53f 100644 --- a/app/views/admin/domain_blocks/index.html.haml +++ b/app/views/admin/domain_blocks/index.html.haml @@ -1,15 +1,16 @@ - content_for :page_title do = t('admin.domain_blocks.title') -%table.table - %thead - %tr - %th= t('admin.domain_blocks.domain') - %th= t('admin.domain_blocks.severity') - %th= t('admin.domain_blocks.reject_media') - %th - %tbody - = render @domain_blocks +.table-wrapper + %table.table + %thead + %tr + %th= t('admin.domain_blocks.domain') + %th= t('admin.domain_blocks.severity') + %th= t('admin.domain_blocks.reject_media') + %th + %tbody + = render @domain_blocks = paginate @domain_blocks = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path, class: 'button' |