kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Revert "[Rails5] Set request.format for artifacts_controller" 

This reverts commit c48e7dc263.

# Conflicts:
#	app/controllers/projects/artifacts_controller.rb
This commit is contained in:
Douwe Maan 2018-11-30 12:54:21 +01:00
parent 76bc2f0874
commit 16f7243fef
No known key found for this signature in database
GPG Key ID: 5976703F65143D36
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/projects/artifacts_controller.rb
View File

@ -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