summary refs log tree commit diff
path: root/synapse/rest/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-03 18:02:33 +0000
committerErik Johnston <erik@matrix.org>2014-12-03 18:02:33 +0000
commit036516d647c6fbd8ec4642a3308e73f71868b1b3 (patch)
tree6cfacc683f68a9e9748058335c36e8ee2fa7f83d /synapse/rest/room.py
parentBump version (diff)
parentBump changes and version (diff)
downloadsynapse-036516d647c6fbd8ec4642a3308e73f71868b1b3.tar.xz
Merge branch 'release-v0.5.4' of github.com:matrix-org/synapse v0.5.4
Diffstat (limited to 'synapse/rest/room.py')
-rw-r--r--synapse/rest/room.py4
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(