diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-02 20:58:32 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-02 20:58:32 +0300 |
| commit | 5782217bfce973b0a654e32b6318cb82d0b4e066 (patch) | |
| tree | ee676015e1ee82983597c74e6c7065ebd03afee0 /lib | |
| parent | a9f02300c885df3b7f7cad6d79e161b9547e8723 (diff) | |
| parent | 1b8d324762787805fabee72d585ac40e244af4d7 (diff) | |
Merge branch 'api_file_touched_at' into 'master'
Add ability to fetch the commit ID of the last commit that actually touched a file
https://dev.gitlab.org/gitlab/gitlabhq/issues/2564
See merge request !1718
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/files.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/files.rb b/lib/api/files.rb index 308c84dd135..a7a768f8895 100644 --- a/lib/api/files.rb +++ b/lib/api/files.rb @@ -43,7 +43,8 @@ module API # "content": "IyA9PSBTY2hlbWEgSW5mb3...", # "ref": "master", # "blob_id": "79f7bbd25901e8334750839545a9bd021f0e4c83", - # "commit_id": "d5a3ff139356ce33e37e73add446f16869741b50" + # "commit_id": "d5a3ff139356ce33e37e73add446f16869741b50", + # "last_commit_id": "570e7b2abdd848b95f2f578043fc23bd6f6fd24d", # } # get ":id/repository/files" do @@ -71,6 +72,7 @@ module API ref: ref, blob_id: blob.id, commit_id: commit.id, + last_commit_id: user_project.repository.last_commit_for_path(commit.sha, file_path).id } else not_found! 'File' |