Merge branch 'dev' into issue-339-no-heartbeats-in-response

Author: elpiel

primitives/src/sentry.rs

@@ -127,6 +127,8 @@ pub struct AggregateEvents {
 pub struct ChannelListResponse {
     pub channels: Vec<Channel>,
     pub total_pages: u64,
+    pub total: u64,
+    pub page: u64,
 }
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]

sentry/src/db/channel.rs

@@ -168,6 +168,8 @@ mod list_channels {
 
         Ok(ChannelListResponse {
             total_pages,
+            total: total_pages,
+            page: skip / limit as u64,
             channels,
         })
     }