diff options
| author | Simon Knox <psimyn@gmail.com> | 2018-11-13 14:07:25 +1100 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2018-11-13 14:07:25 +1100 |
| commit | ed335291dbeda5b34ae14c47eb7f9058cd5339f6 (patch) | |
| tree | 98420e96bdd3379df2777c98cee85e47b9ff078a /app/controllers/projects/artifacts_controller.rb | |
| parent | 2dce46e941eb55dc55f3d85984298d7a9654e2cc (diff) | |
| parent | 03e46cf72babbeb1df1320524fdf34b09fe1292c (diff) | |
| download | gitlab-ce-ed335291dbeda5b34ae14c47eb7f9058cd5339f6.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 49479-hide-unmerged-env-perf-stats49479-hide-unmerged-env-perf-stats
Diffstat (limited to 'app/controllers/projects/artifacts_controller.rb')
| -rw-r--r-- | app/controllers/projects/artifacts_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb index 312e256ea6c..ae9c17802b9 100644 --- a/app/controllers/projects/artifacts_controller.rb +++ b/app/controllers/projects/artifacts_controller.rb @@ -16,7 +16,7 @@ class Projects::ArtifactsController < Projects::ApplicationController def download return render_404 unless artifacts_file - send_upload(artifacts_file, attachment: artifacts_file.filename) + send_upload(artifacts_file, attachment: artifacts_file.filename, proxy: params[:proxy]) end def browse |