diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-12 03:30:57 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-12 03:30:57 -0500 |
| commit | a817f084eafaf5527445c29ab1d68f42b1a2872f (patch) | |
| tree | f146e6c8ff958d60804e33e40e1970784f5b7b90 /app/controllers/api | |
| parent | eb72c3398cd70c6b595fae5a0cb6730a3e49bd61 (diff) | |
| parent | 8e88a18316d45a459a31d67487bccc247592d187 (diff) | |
Merge remote-tracking branch 'tootsuite/master'
Conflicts: app/controllers/statuses_controller.rb
Diffstat (limited to 'app/controllers/api')
| -rw-r--r-- | app/controllers/api/v1/statuses_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb index 28c28592a..e98241323 100644 --- a/app/controllers/api/v1/statuses_controller.rb +++ b/app/controllers/api/v1/statuses_controller.rb @@ -17,7 +17,7 @@ class Api::V1::StatusesController < Api::BaseController end def context - ancestors_results = @status.in_reply_to_id.nil? ? [] : @status.ancestors(current_account) + ancestors_results = @status.in_reply_to_id.nil? ? [] : @status.ancestors(DEFAULT_STATUSES_LIMIT, current_account) descendants_results = @status.descendants(current_account) loaded_ancestors = cache_collection(ancestors_results, Status) loaded_descendants = cache_collection(descendants_results, Status) |