Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `Gemfile.lock`:
  No real conflict, glitch-soc-only dependency (redcarpet) too close to an
  upstream one (rdf-normalize)
- `README.md`:
  we have different READMEs, discarded upstream's changes
- `app/views/admin/custom_emojis/index.html.haml`:
  No real conflict, different context because of glitch-soc theming
- `lib/mastodon/statuses_cli.rb`:
  Upstream added code to keep bookmarked statuses, we were already doing so
  with slightly different code. Discarded upstream's changes.
- `package.json`:
  No real conflict, glitch-soc-only dependency (favico.js) too close to
  an upstream one

app/views/admin/custom_emojis/index.html.haml

@@ -1,6 +1,9 @@
 - content_for :page_title do
   = t('admin.custom_emojis.title')
 
+- content_for :heading_actions do
+  = link_to t('admin.custom_emojis.upload'), new_admin_custom_emoji_path, class: 'button'
+
 .filters
   .filter-subset
     %strong= t('admin.accounts.location.title')
@@ -78,6 +81,3 @@
 
 = paginate @custom_emojis
 
-%hr.spacer/
-
-= link_to t('admin.custom_emojis.upload'), new_admin_custom_emoji_path, class: 'button'

app/views/admin/email_domain_blocks/index.html.haml

@@ -1,14 +1,19 @@
 - content_for :page_title do
   = t('admin.email_domain_blocks.title')
 
-.table-wrapper
-  %table.table
-    %thead
-      %tr
-        %th= t('admin.email_domain_blocks.domain')
-        %th
-    %tbody
-      = render @email_domain_blocks
+- content_for :heading_actions do
+  = link_to t('admin.email_domain_blocks.add_new'), new_admin_email_domain_block_path, class: 'button'
+
+- if @email_domain_blocks.count == 0
+  %div.muted-hint.center-text=t 'admin.email_domain_blocks.empty'
+- else
+  .table-wrapper
+    %table.table
+      %thead
+        %tr
+          %th= t('admin.email_domain_blocks.domain')
+          %th
+      %tbody
+        = render @email_domain_blocks
 
 = paginate @email_domain_blocks
-= link_to t('admin.email_domain_blocks.add_new'), new_admin_email_domain_block_path, class: 'button'

app/views/admin/reports/show.html.haml

@@ -1,7 +1,7 @@
 - content_for :page_title do
   = t('admin.reports.report', id: @report.id)
 
-- content_for :page_heading_actions do
+- content_for :heading_actions do
   - if @report.unresolved?
     = link_to t('admin.reports.mark_as_resolved'), resolve_admin_report_path(@report), method: :post, class: 'button'
   - else

app/views/filters/index.html.haml

@@ -1,12 +1,11 @@
 - content_for :page_title do
   = t('filters.index.title')
 
-- content_for :page_heading_actions do
+- content_for :heading_actions do
   = link_to t('filters.new.title'), new_filter_path, class: 'button'
 
 - if @filters.count == 0
-  %div{ style: 'display: flex; justify-content: center' }
-    %div.muted-hint= t 'filters.index.empty'
+  %div.muted-hint.center-text= t 'filters.index.empty'
 - else
   .table-wrapper
     %table.table

app/views/layouts/admin.html.haml

@@ -21,9 +21,9 @@
         .content-heading
           %h2= yield :page_title
 
-          - if :page_heading_actions
+          - if :heading_actions
             .content-heading-actions
-              = yield :page_heading_actions
+              = yield :heading_actions
 
         = render 'application/flashes'
 

app/views/settings/applications/index.html.haml

@@ -1,20 +1,25 @@
 - content_for :page_title do
   = t('doorkeeper.applications.index.title')
 
-.table-wrapper
-  %table.table
-    %thead
-      %tr
-        %th= t('doorkeeper.applications.index.application')
-        %th= t('doorkeeper.applications.index.scopes')
-        %th
-    %tbody
-      - @applications.each do |application|
+- content_for :heading_actions do
+  = link_to t('doorkeeper.applications.index.new'), new_settings_application_path, class: 'button'
+
+- if @applications.count == 0
+  %div.muted-hint.center-text=t 'doorkeeper.applications.index.empty'
+- else
+  .table-wrapper
+    %table.table
+      %thead
         %tr
-          %td= link_to application.name, settings_application_path(application)
-          %th= application.scopes
-          %td
-            = table_link_to 'times', t('doorkeeper.applications.index.delete'), settings_application_path(application), method: :delete, data: { confirm: t('doorkeeper.applications.confirmations.destroy') }
+          %th= t('doorkeeper.applications.index.application')
+          %th= t('doorkeeper.applications.index.scopes')
+          %th
+      %tbody
+        - @applications.each do |application|
+          %tr
+            %td= link_to application.name, settings_application_path(application)
+            %th= application.scopes
+            %td
+              = table_link_to 'times', t('doorkeeper.applications.index.delete'), settings_application_path(application), method: :delete, data: { confirm: t('doorkeeper.applications.confirmations.destroy') }
 
 = paginate @applications
-= link_to t('doorkeeper.applications.index.new'), new_settings_application_path, class: 'button'