diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-05 17:31:56 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-05 17:31:56 -0600 |
| commit | 03aeab857f0972e74910307f1a5954353eb70a28 (patch) | |
| tree | b0b6243ee40684a949cff440bb56dcad7eec8674 /app/controllers/api/v1/instances | |
| parent | f441770e50621ac59a7b022ee2127964935b2b8d (diff) | |
| parent | f6adb409fd8f4bf42c1da54cc1e7e42886612c14 (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/controllers/api/v1/instances')
| -rw-r--r-- | app/controllers/api/v1/instances/activity_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/api/v1/instances/activity_controller.rb b/app/controllers/api/v1/instances/activity_controller.rb index 36f52c38d..e14e0aee8 100644 --- a/app/controllers/api/v1/instances/activity_controller.rb +++ b/app/controllers/api/v1/instances/activity_controller.rb @@ -21,9 +21,9 @@ class Api::V1::Instances::ActivityController < Api::BaseController weeks << { week: week.to_time.to_i.to_s, - statuses: Redis.current.get("activity:statuses:local:#{week_id}") || 0, - logins: Redis.current.pfcount("activity:logins:#{week_id}"), - registrations: Redis.current.get("activity:accounts:local:#{week_id}") || 0, + statuses: Redis.current.get("activity:statuses:local:#{week_id}") || '0', + logins: Redis.current.pfcount("activity:logins:#{week_id}").to_s, + registrations: Redis.current.get("activity:accounts:local:#{week_id}") || '0', } end |