diff options
| author | David Baker <dave@matrix.org> | 2014-12-18 15:06:11 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2014-12-18 15:06:11 +0000 |
| commit | 0a6664493a6277d6b7b78b54e0b2a6da591ad158 (patch) | |
| tree | a01e93cb31ca94d83dba6a9a381997b88f5b3a25 /synapse/rest | |
| parent | Thank you, pyflakes (diff) | |
| parent | Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse (diff) | |
| download | synapse-0a6664493a6277d6b7b78b54e0b2a6da591ad158.tar.xz | |
Merge branch 'master' into pushers
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/room.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py index cc6ffb9aff..3147d7a60b 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -327,7 +327,9 @@ class RoomMessageListRestServlet(RestServlet): @defer.inlineCallbacks def on_GET(self, request, room_id): user = yield self.auth.get_user_by_req(request) - pagination_config = PaginationConfig.from_request(request) + pagination_config = PaginationConfig.from_request(request, + default_limit=10, + ) with_feedback = "feedback" in request.args handler = self.handlers.message_handler msgs = yield handler.get_messages( |