parent
13a44be306
commit
4a944c5ab4
2 changed files with 7 additions and 6 deletions
|
|
@ -5,6 +5,7 @@
|
|||
* Remove jQuery deprecations [#7356](https://github.com/diaspora/diaspora/pull/7356)
|
||||
* Use empty selector where "#" was used as a selector before (prepare jQuery 3 upgrade) [#7372](https://github.com/diaspora/diaspora/pull/7372)
|
||||
* Increase maximal height of large thumbnail on mobile [#7383](https://github.com/diaspora/diaspora/pull/7383)
|
||||
* Reduce conversation recipient size [#7376](https://github.com/diaspora/diaspora/pull/7376)
|
||||
|
||||
## Bug fixes
|
||||
* Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
|
||||
|
|
|
|||
|
|
@ -271,12 +271,12 @@ class Person < ActiveRecord::Base
|
|||
def as_json( opts = {} )
|
||||
opts ||= {}
|
||||
json = {
|
||||
:id => self.id,
|
||||
:guid => self.guid,
|
||||
:name => self.name,
|
||||
:avatar => self.profile.image_url(:thumb_medium),
|
||||
:handle => self.diaspora_handle,
|
||||
:url => Rails.application.routes.url_helpers.person_path(self),
|
||||
id: id,
|
||||
guid: guid,
|
||||
name: name,
|
||||
avatar: profile.image_url(:thumb_small),
|
||||
handle: diaspora_handle,
|
||||
url: Rails.application.routes.url_helpers.person_path(self)
|
||||
}
|
||||
json.merge!(:tags => self.profile.tags.map{|t| "##{t.name}"}) if opts[:includes] == "tags"
|
||||
json
|
||||
|
|
|
|||
Loading…
Reference in a new issue