diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-11 13:22:00 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-11 13:22:00 +0100 |
| commit | 9f548dffc33158adb02ef1ec9a6e98b3d090f22b (patch) | |
| tree | 39f5619db8f33c70dcdf52dbc8d07b3cb8486e59 /lib/api/files.rb | |
| parent | 8db063b579322238af43f6d04b5968d9c6ea935d (diff) | |
| parent | dfa09789061bbd3891c17ebbcc23f7bd6b95336c (diff) | |
| download | gitlab-ce-9f548dffc33158adb02ef1ec9a6e98b3d090f22b.tar.gz | |
Merge branch 'master' into rake-tasks-git
Diffstat (limited to 'lib/api/files.rb')
| -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' |