From 16f7243fefff4a65cee777e5d2b00800872ab6a4 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 30 Nov 2018 12:54:21 +0100 Subject: [PATCH] Revert "[Rails5] Set request.format for artifacts_controller" This reverts commit c48e7dc2633f8ee8f38150b050938f43e75bd207. # Conflicts: # app/controllers/projects/artifacts_controller.rb --- app/controllers/projects/artifacts_controller.rb | 9 --------- 1 file changed, 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