Merge branch 'master' into release/material-design-tweaks

This commit is contained in:
Andrew Brown 2017-02-23 16:32:41 +00:00
commit 7696a9d25a

View File

@ -31,7 +31,7 @@ class ContentController < ApplicationController
'content_type': content_type.name,
'content_owner': current_user.present? && current_user.id == @content.user_id,
'logged_in_user': current_user.present?
})
}) if current_user
respond_to do |format|
format.html { render 'content/show', locals: { content: @content } }