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

2020-11-07 18:19:34 +01:00
parent 5a9fc749c3 ee8cf246cf
commit 412218af2e
56 changed files with 403 additions and 170 deletions
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -39,12 +39,12 @@
            = render partial: 'statuses/status', collection: @pinned_statuses, as: :status, locals: { pinned: true }

          - if @newer_url
-            .entry= link_to_more @newer_url
+            .entry= link_to_newer @newer_url

          = render partial: 'statuses/status', collection: @statuses, as: :status

          - if @older_url
-            .entry= link_to_more @older_url
+            .entry= link_to_older @older_url

  .column-1
    - if @account.memorial?