summaryrefslogtreecommitdiff
path: root/app/controllers/projects/avatars_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-06-06 13:16:30 +0200
committerDouwe Maan <douwe@selenight.nl>2016-06-06 13:16:30 +0200
commit8c3ba8d6c9021f250fb1597f6b597d817af46b38 (patch)
tree0282f6ce75ad214634839ab04cc1f111af06cd35 /app/controllers/projects/avatars_controller.rb
parent3cb69f0c0b0049426e6abad0914812a9eef87b04 (diff)
downloadgitlab-ce-8c3ba8d6c9021f250fb1597f6b597d817af46b38.tar.gz
Add workhorse controller and API helpers
Diffstat (limited to 'app/controllers/projects/avatars_controller.rb')
-rw-r--r--app/controllers/projects/avatars_controller.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/projects/avatars_controller.rb b/app/controllers/projects/avatars_controller.rb
index 72921b3aa14..5962f74c39b 100644
--- a/app/controllers/projects/avatars_controller.rb
+++ b/app/controllers/projects/avatars_controller.rb
@@ -10,10 +10,7 @@ class Projects::AvatarsController < Projects::ApplicationController
return if cached_blob?
- headers.store(*Gitlab::Workhorse.send_git_blob(@repository, @blob))
- headers['Content-Disposition'] = 'inline'
- headers['Content-Type'] = safe_content_type(@blob)
- head :ok # 'render nothing: true' messes up the Content-Type
+ send_git_blob @repository, @blob
else
render_404
end