about summary refs log tree commit diff
path: root/app/views/profile
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/profile')
-rw-r--r--app/views/profile/_favourite.html.haml5
-rw-r--r--app/views/profile/_follow.html.haml5
-rw-r--r--app/views/profile/_status.html.haml2
3 files changed, 11 insertions, 1 deletions
diff --git a/app/views/profile/_favourite.html.haml b/app/views/profile/_favourite.html.haml
new file mode 100644
index 000000000..85e3a0824
--- /dev/null
+++ 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
diff --git a/app/views/profile/_follow.html.haml b/app/views/profile/_follow.html.haml
new file mode 100644
index 000000000..c1c081374
--- /dev/null
+++ 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
diff --git a/app/views/profile/_status.html.haml b/app/views/profile/_status.html.haml
index 1edd8df77..b089036b1 100644
--- 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 }