Commit 211365c1 authored by Dennis Schubert's avatar Dennis Schubert

Merge branch 'master' into stable

parents 629e489d ad20bb05
......@@ -11,6 +11,11 @@
* Keyboard shortcuts now do work on profile pages as well [#6647](https://github.com/diaspora/diaspora/pull/6647/files)
* Add the podmin email address to 500 errors [#6652](https://github.com/diaspora/diaspora/pull/6652)
# 0.5.6.3
Fix evil regression caused by Active Model no longer exposing
`include_root_in_json` in instances.
# 0.5.6.2
* Fix [CVE-2016-0751](https://groups.google.com/forum/#!topic/rubyonrails-security/9oLY_FCzvoc) - Possible Object Leak and Denial of Service attack in Action Pack
......
......@@ -3,6 +3,8 @@
# the COPYRIGHT file.
class Post < ActiveRecord::Base
self.include_root_in_json = false
include ApplicationHelper
include Diaspora::Federated::Shareable
......
......@@ -9,7 +9,6 @@ class PostPresenter < BasePresenter
end
def as_json(_options={})
@post.include_root_in_json = false
@post.as_json(only: directly_retrieved_attributes).merge(non_directly_retrieved_attributes)
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment