diff options
| author | shel <Yiskah.Raphen@gmail.com> | 2017-03-31 10:34:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 10:34:14 -0400 |
| commit | f20f6b25b98efffca47caae713f8dc5e1d0d4bd1 (patch) | |
| tree | 104152d4bd6f9889f38b2f46fee108185c3b29f7 /app/controllers/api/v1/notifications_controller.rb | |
| parent | 76188d61f2c3bb5747208df92835e912db18d7b6 (diff) | |
| parent | 680f9efe9c4aa7fce1f4dd6a35ef4aca7a80c1f3 (diff) | |
Merge branch 'master' into patch-2
Diffstat (limited to 'app/controllers/api/v1/notifications_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/notifications_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb index 544ba2442..7bbc5419c 100644 --- a/app/controllers/api/v1/notifications_controller.rb +++ b/app/controllers/api/v1/notifications_controller.rb @@ -14,8 +14,8 @@ class Api::V1::NotificationsController < ApiController statuses = @notifications.select { |n| !n.target_status.nil? }.map(&:target_status) set_maps(statuses) - set_counters_maps(statuses) - set_account_counters_maps(@notifications.map(&:from_account)) + # set_counters_maps(statuses) + # set_account_counters_maps(@notifications.map(&:from_account)) next_path = api_v1_notifications_url(max_id: @notifications.last.id) unless @notifications.empty? prev_path = api_v1_notifications_url(since_id: @notifications.first.id) unless @notifications.empty? |