A lot of fixes from a live test

2016-02-28 15:46:29 +01:00
parent f1654da7ad
commit 47d50b0e39
17 changed files with 59 additions and 27 deletions
--- a/app/views/profile/_favourite.html.haml
+++ b/app/views/profile/_favourite.html.haml
@@ -0,0 +1,5 @@
+.entry.entry-favourite
+  .content
+    %strong= favourite.account.acct
+    favourited a post by
+    %strong= favourite.status.account.acct
--- a/app/views/profile/_follow.html.haml
+++ b/app/views/profile/_follow.html.haml
@@ -0,0 +1,5 @@
+.entry.entry-follow
+  .content
+    %strong= follow.account.acct
+    is now following
+    %strong= follow.target_account.acct
--- a/app/views/profile/_status.html.haml
+++ b/app/views/profile/_status.html.haml
@@ -14,7 +14,7 @@
      .header
        = render partial: 'status_header', locals: { status: status.reblog? ? status.reblog : status }
      .content
-        = status.content
+        = status.content.html_safe
      .counters
        = render partial: 'status_footer', locals: { status: status.reblog? ? status.reblog : status }