diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-06 06:15:48 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-06 06:15:48 -0800 |
| commit | 1c0929f5acbabcd7ebb0f95e4da2a4e18713e7e2 (patch) | |
| tree | 08885aa56f612f032366ef16717ccc74b9a7a637 /lib/api | |
| parent | 354a28546dd26b15a8690f38487bd5c309fd5ba6 (diff) | |
| parent | 7b3b63d4d49dd5c3876e2f0c02026dd9cb289f32 (diff) | |
| download | gitlab-ce-1c0929f5acbabcd7ebb0f95e4da2a4e18713e7e2.tar.gz | |
Merge pull request #5823 from bobot/feature/api_parent_ids
[API] add parent_ids to specific commit informations
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 4 | ||||
| -rw-r--r-- | lib/api/repositories.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 7daf8ace242..8d2f38c4daa 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -91,6 +91,10 @@ module API expose :id, :short_id, :title, :author_name, :author_email, :created_at end + class RepoCommitDetail < RepoCommit + expose :parent_ids, :committed_date, :authored_date + end + class ProjectSnippet < Grape::Entity expose :id, :title, :file_name expose :author, using: Entities::UserBasic diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb index 0a32135ff10..c99c8f7bdfb 100644 --- a/lib/api/repositories.rb +++ b/lib/api/repositories.rb @@ -112,7 +112,7 @@ module API sha = params[:sha] commit = user_project.repository.commit(sha) not_found! "Commit" unless commit - present commit, with: Entities::RepoCommit + present commit, with: Entities::RepoCommitDetail end # Get the diff for a specific commit of a project |