diff options
| author | Douwe Maan <douwe@selenight.nl> | 2018-11-30 14:54:21 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2018-12-03 14:29:01 +0300 |
| commit | 16f7243fefff4a65cee777e5d2b00800872ab6a4 (patch) | |
| tree | deb82e3a0b9277d6dea4affb1e810ebccafa6d0a /app/controllers/projects/artifacts_controller.rb | |
| parent | 76bc2f087406ae55f74eaf6c802d52fae4b87ccf (diff) | |
Revert "[Rails5] Set request.format for artifacts_controller"
This reverts commit c48e7dc2633f8ee8f38150b050938f43e75bd207.
# Conflicts:
# app/controllers/projects/artifacts_controller.rb
Diffstat (limited to 'app/controllers/projects/artifacts_controller.rb')
| -rw-r--r-- | app/controllers/projects/artifacts_controller.rb | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb index ae9c17802b9..1a91e07b97f 100644 --- a/app/controllers/projects/artifacts_controller.rb +++ b/app/controllers/projects/artifacts_controller.rb @@ -9,7 +9,6 @@ class Projects::ArtifactsController < Projects::ApplicationController before_action :authorize_read_build! before_action :authorize_update_build!, only: [:keep] before_action :extract_ref_name_and_path - before_action :set_request_format, only: [:file] before_action :validate_artifacts!, except: [:download] before_action :entry, only: [:file] @@ -110,12 +109,4 @@ class Projects::ArtifactsController < Projects::ApplicationController render_404 unless @entry.exists? end - - def set_request_format - request.format = :html if set_request_format? - end - - def set_request_format? - request.format != :json - end end |