diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-01-28 20:04:46 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-01-28 20:04:46 +0300 |
| commit | 26d97ac5e19c242594b59d224a77d41d0f1de6e1 (patch) | |
| tree | a3b9fab50b744b3480b9db242538484ebb76b834 /app/controllers/projects/avatars_controller.rb | |
| parent | 9109619ee6fe85ee7e8ebfa51c6587319b523930 (diff) | |
Send more raw blob data with workhorse
Diffstat (limited to 'app/controllers/projects/avatars_controller.rb')
| -rw-r--r-- | app/controllers/projects/avatars_controller.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/app/controllers/projects/avatars_controller.rb b/app/controllers/projects/avatars_controller.rb index 548f1b9ebfe..0cd65ad5b16 100644 --- a/app/controllers/projects/avatars_controller.rb +++ b/app/controllers/projects/avatars_controller.rb @@ -2,15 +2,14 @@ class Projects::AvatarsController < Projects::ApplicationController before_action :project def show - @blob = @project.repository.blob_at_branch('master', @project.avatar_in_git) + repository = @project.repository + @blob = repository.blob_at_branch('master', @project.avatar_in_git) if @blob headers['X-Content-Type-Options'] = 'nosniff' - send_data( - @blob.data, - type: @blob.mime_type, - disposition: 'inline', - filename: @blob.name - ) + headers['Gitlab-Workhorse-Repo-Path'] = repository.path_to_repo + headers['Gitlab-Workhorse-Send-Blob'] = @blob.id + headers['Content-Disposition'] = 'inline' + render nothing: true, content_type: @blob.content_type else render_404 end |