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

2022-06-10 11:51:43 +02:00
parent 3d841eba69 a2871cd747
commit edaaf6a5e9
156 changed files with 1768 additions and 156 deletions
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -22,7 +22,10 @@
    .content-wrapper
      .content
        .content-heading
-          %h2= yield :page_title
+          - if content_for?(:heading)
+            = yield :heading
+          - else
+            %h2= yield :page_title

          - if :heading_actions
            .content-heading-actions