summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-03-30 19:01:03 +0000
committerDouwe Maan <douwe@gitlab.com>2015-03-30 19:01:03 +0000
commitfe7992a5249b84376aced47696ee1306f3d9799b (patch)
tree857a3ed6d0fbf3c4ce30ec72ae52c404c76479fb
parent5059681f2277217df871103a289f59aa032e1d2a (diff)
parent3b3662da0a5f31dddbe19be7f8e787c1b90b1b22 (diff)
downloadgitlab-ce-fe7992a5249b84376aced47696ee1306f3d9799b.tar.gz
Merge branch 'events-paginate' into 'master'
API: Events paginate Updated the api method for /project/:id/events, to use the paginate method instead of limiting and offsetting the recent events in the method itself. This will also change the first page to be 1 instead of 0, but using 0 will still work and will give back the first page. This also add's the link headers (next/first/last). See merge request !267
-rw-r--r--CHANGELOG1
-rw-r--r--lib/api/projects.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 021110b0e2a..1f516f7ae51 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -51,6 +51,7 @@ v 7.10.0 (unreleased)
- Prevent holding Control-Enter or Command-Enter from posting comment multiple times.
- Prevent note form from being cleared when submitting failed.
- Improve file icons rendering on tree (Sullivan Sénéchal)
+ - API: Add pagination to project events
v 7.9.0
- Send EmailsOnPush email when branch or tag is created or deleted.
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 620922092de..e3fff79d68f 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -88,7 +88,7 @@ module API
present user_project, with: Entities::ProjectWithAccess, user: current_user
end
- # Get a single project events
+ # Get events for a single project
#
# Parameters:
# id (required) - The ID of a project