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/reports | |
| 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/reports')
| -rw-r--r-- | app/views/admin/reports/index.html.haml | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml index f1c4a93c4..577c68a86 100644 --- a/app/views/admin/reports/index.html.haml +++ b/app/views/admin/reports/index.html.haml @@ -10,17 +10,18 @@ = form_tag do - %table.table - %thead - %tr - -# %th - %th= t('admin.reports.id') - %th= t('admin.reports.target') - %th= t('admin.reports.reported_by') - %th= t('admin.reports.comment.label') - %th= t('admin.reports.report_contents') - %th - %tbody - = render @reports + .table-wrapper + %table.table + %thead + %tr + -# %th + %th= t('admin.reports.id') + %th= t('admin.reports.target') + %th= t('admin.reports.reported_by') + %th= t('admin.reports.comment.label') + %th= t('admin.reports.report_contents') + %th + %tbody + = render @reports = paginate @reports |