Merge branch 'budgets' of github.com:consul/consul into budgets

2017-01-09 17:10:46 +01:00
parent e6cc09a460 c5278bfb3b
commit 2a3cbee96a
31 changed files with 949 additions and 286 deletions
--- a/app/views/budgets/investments/_investment_show.html.erb
+++ b/app/views/budgets/investments/_investment_show.html.erb
@@ -35,6 +35,8 @@
        </p>
      <% end %>

+      <%= render 'shared/tags', taggable: @investment %>
+
      <%= safe_html_with_links investment.description.html_safe %>

      <% if investment.external_url.present? %>