diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-04-02 01:27:11 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-04-02 01:27:11 +0300 |
| commit | dba3fc46666360ccf887fa610478e8d8d8218383 (patch) | |
| tree | df44096b571de90728fc63ea77278266d6e7a1ba /app | |
| parent | 9269ac1b6951aa5d239c77bab36bd736b8e71b12 (diff) | |
| parent | 8c5b3d030210cc2659107ec2633a496165470125 (diff) | |
Merge branch 'bvl-stream-io-into-gitaly' into 'master'
Allow streaming io objects into Gitaly
See merge request gitlab-org/gitlab-ce!26738
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 909b17e9c8d..7e072788fc9 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -172,8 +172,7 @@ class Projects::BlobController < Projects::ApplicationController end if params[:file].present? - params[:content] = Base64.encode64(params[:file].read) - params[:encoding] = 'base64' + params[:content] = params[:file] end @commit_params = { |