diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-03 11:56:49 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-03 11:56:49 +0000 |
| commit | 6941a1971548ea8ba37130deeffe2a2e2cd88085 (patch) | |
| tree | 9b6947d42c18e4a7ccb9c4e34525faa8e073cf76 /synapse/rest | |
| parent | Begin fleshing out a new Event object (diff) | |
| parent | Fix bug where did not always resolve all the deferreds in _attempt_new_transa... (diff) | |
| download | synapse-6941a1971548ea8ba37130deeffe2a2e2cd88085.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
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( |