about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authornullkal <nullkal@nil.nu>2017-08-26 01:50:52 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-08-25 18:50:52 +0200
commitc2af1381130caae0acc02db853580a2bdab61078 (patch)
tree5129ff07cb41f5a132b5e7da56f7686f9c2c0776 /app/controllers
parentfb8aa2b3bac122f819b07c7f9461b26cc369c621 (diff)
Allow multiple pinned statuses to be shown and make them be ordered b… (#4690)
* Allow multiple pinned statuses to be shown and make them be ordered by pinned date

* Set timestamps NOT NULL

* Make single-line pinned_statuses

* Spec for pinned_statuses

* Remove redundant empty line
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/accounts_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index f4ca239ba..8dad12f11 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -14,7 +14,7 @@ class AccountsController < ApplicationController
           return
         end
 
-        @pinned_statuses = cache_collection(@account.pinned_statuses.limit(1), Status) unless media_requested?
+        @pinned_statuses = cache_collection(@account.pinned_statuses, Status) unless media_requested?
         @statuses        = filtered_statuses.paginate_by_max_id(20, params[:max_id], params[:since_id])
         @statuses        = cache_collection(@statuses, Status)
         @next_url        = next_url unless @statuses.empty?