diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-11-03 13:48:57 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-11-03 13:48:57 +0100 |
| commit | 2674a14becba89bb6b5259cd0ff3e5b29b724325 (patch) | |
| tree | e076fe55932b5a053f8f5858f5d824d6a06d2f4d /lib/api | |
| parent | 63cafdb8e5f9481539beaf2b6eac11cf8148daf1 (diff) | |
| parent | 86c0d8d28983c4f6abbcbf461e422b2fe5962847 (diff) | |
| download | gitlab-ce-2674a14becba89bb6b5259cd0ff3e5b29b724325.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into spread-runner-last-updated-atspread-runner-last-updated-at
Diffstat (limited to 'lib/api')
| -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' |