nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into stable

Browse source
This commit is contained in:
Dennis Schubert 2016-01-26 15:19:27 +01:00
commit 211365c169
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Changelog.md
View file

@ -11,6 +11,11 @@
* Keyboard shortcuts now do work on profile pages as well [#6647](https://github.com/diaspora/diaspora/pull/6647/files) * 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) * 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 # 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 * 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

2
app/models/post.rb
View file

@ -3,6 +3,8 @@
# the COPYRIGHT file. # the COPYRIGHT file.
class Post < ActiveRecord::Base class Post < ActiveRecord::Base
self.include_root_in_json = false
include ApplicationHelper include ApplicationHelper
include Diaspora::Federated::Shareable include Diaspora::Federated::Shareable

1
app/presenters/post_presenter.rb
View file

@ -9,7 +9,6 @@ class PostPresenter < BasePresenter
end end
def as_json(_options={}) def as_json(_options={})
@post.include_root_in_json = false
@post.as_json(only: directly_retrieved_attributes).merge(non_directly_retrieved_attributes) @post.as_json(only: directly_retrieved_attributes).merge(non_directly_retrieved_attributes)
end end