summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-29 03:35:16 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-29 03:35:16 -0700
commit7096ebe8c6420acfdd99cfd8631dc40c029d9559 (patch)
treec7aeb92f2947b457179489b08e9fdda570c56de3
parentccab346a7899d34ffcdd0169dbc87450eb2aca59 (diff)
parentbba2b10eb5430195b3f5f874c0379fe77213246a (diff)
downloadgitlab-ce-7096ebe8c6420acfdd99cfd8631dc40c029d9559.tar.gz
Merge pull request #9048 from NARKOZ/api
properly paginate project events in API
-rw-r--r--lib/api/projects.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 83f65eec6cc..620922092de 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -95,10 +95,7 @@ module API
# Example Request:
# GET /projects/:id/events
get ":id/events" do
- limit = (params[:per_page] || 20).to_i
- offset = (params[:page] || 0).to_i * limit
- events = user_project.events.recent.limit(limit).offset(offset)
-
+ events = paginate user_project.events.recent
present events, with: Entities::Event
end