diff options
author | Robert Speicher <robert@gitlab.com> | 2016-06-10 16:21:26 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-06-10 16:21:26 +0000 |
commit | 37be2007f9aa6197c1304a450110aecbde5434f9 (patch) | |
tree | 63e12aaae7dad8a962141b78542431083aea23dd /lib/api/helpers.rb | |
parent | d6de816982eb9a227a384c3318d050a23ad18529 (diff) | |
parent | 701e2df7e55113dafd48c570baad44bf7f24f863 (diff) | |
download | gitlab-ce-37be2007f9aa6197c1304a450110aecbde5434f9.tar.gz |
Merge branch 'workhorse-helpers' into 'master'
Add workhorse controller and API helpers
Adds `send_git_blob` and `send_git_archive` controller and API helpers to reduce duplication and make Workhorse easier for a developer to work with.
See merge request !4486
Diffstat (limited to 'lib/api/helpers.rb')
-rw-r--r-- | lib/api/helpers.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 2aaa0557ea3..e1d3bbcc02d 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -408,5 +408,15 @@ module API error!(errors[:access_level], 422) if errors[:access_level].any? not_found!(errors) end + + def send_git_blob(repository, blob) + env['api.format'] = :txt + content_type 'text/plain' + header(*Gitlab::Workhorse.send_git_blob(repository, blob)) + end + + def send_git_archive(repository, ref:, format:) + header(*Gitlab::Workhorse.send_git_archive(repository, ref: ref, format: format)) + end end end |