Fix rebase with master.

2017-08-28 14:09:44 +02:00
parent 188d492f7a
commit 54cf210b07
8 changed files with 22 additions and 21 deletions
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -1,9 +1,9 @@
 <div class="row topic-show">
  <div class="small-12 medium-12 column">
-    <%= render "shared/back_link" %>
+    <%= back_link_to community_path(@community) %>
    <br>

-    <p><%= t("community.topic.show.community_of_the_proposal") %> <strong><%= community_title(@community) %></strong></p>
+    <p><%= community_text(@community) %> <strong><%= community_title(@community) %></strong></p>
    <h1><%= @topic.title %></h1>
    <div class="topic-info">
      <p><%= @topic.description %></p>