diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-09 22:12:34 +0300 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-09 22:12:34 +0300 |
commit | 565a5e36fc456831fd08e0627a936855d87eb932 (patch) | |
tree | eac454430fd7d39e042f38d087f944de6bed6905 /lib/api/commits.rb | |
parent | 5196f8e993491e8e9dea6e36a7c5c3b8d95a5491 (diff) | |
parent | c78b97df0eb275415d6ed5ef297841ee2f61b473 (diff) | |
download | gitlab-ce-565a5e36fc456831fd08e0627a936855d87eb932.tar.gz |
Merge branch 'docker-registry' into docker-registry-view
Diffstat (limited to 'lib/api/commits.rb')
-rw-r--r-- | lib/api/commits.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/api/commits.rb b/lib/api/commits.rb index 4544a41b1e3..93a3a5ce089 100644 --- a/lib/api/commits.rb +++ b/lib/api/commits.rb @@ -12,14 +12,20 @@ module API # Parameters: # id (required) - The ID of a project # ref_name (optional) - The name of a repository branch or tag, if not given the default branch is used + # since (optional) - Only commits after or in this date will be returned + # until (optional) - Only commits before or in this date will be returned # Example Request: # GET /projects/:id/repository/commits get ":id/repository/commits" do + datetime_attributes! :since, :until + page = (params[:page] || 0).to_i per_page = (params[:per_page] || 20).to_i ref = params[:ref_name] || user_project.try(:default_branch) || 'master' + after = params[:since] + before = params[:until] - commits = user_project.repository.commits(ref, nil, per_page, page * per_page) + commits = user_project.repository.commits(ref, limit: per_page, offset: page * per_page, after: after, before: before) present commits, with: Entities::RepoCommit end |