parent
5ea7b8ee13
commit
c91c19b633
2 changed files with 2 additions and 1 deletions
|
|
@ -3,6 +3,7 @@
|
|||
## Refactor
|
||||
* Remove title from profile photo upload button [#7551](https://github.com/diaspora/diaspora/pull/7551)
|
||||
* Remove Internet Explorer workarounds [#7557](https://github.com/diaspora/diaspora/pull/7557)
|
||||
* Sort notifications by last interaction [#7568](https://github.com/diaspora/diaspora/pull/7568)
|
||||
|
||||
## Bug fixes
|
||||
* Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ class NotificationsController < ApplicationController
|
|||
@notifications = WillPaginate::Collection.create(page, per_page, Notification.where(conditions).count ) do |pager|
|
||||
result = Notification.where(conditions)
|
||||
.includes(:target, :actors => :profile)
|
||||
.order('created_at desc')
|
||||
.order("updated_at desc")
|
||||
.limit(pager.per_page)
|
||||
.offset(pager.offset)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue