diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-18 09:22:57 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-18 09:22:57 +0000 |
| commit | 47bfd782bdad9a021ae3241825c9538d42eee7a4 (patch) | |
| tree | 89e2411afe981573999d66b7057707f2eb20ed4f | |
| parent | 95753b5ec7050b2d7c9848546a0802bcff0702b6 (diff) | |
| parent | c48e7dc2633f8ee8f38150b050938f43e75bd207 (diff) | |
| download | gitlab-ce-47bfd782bdad9a021ae3241825c9538d42eee7a4.tar.gz | |
Merge branch 'blackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404' into 'master'
Resolve "[Rails5] expected the response to have status code :ok but it was 404"
Closes #48008
See merge request gitlab-org/gitlab-ce!19937
| -rw-r--r-- | app/controllers/projects/artifacts_controller.rb | 9 | ||||
| -rw-r--r-- | changelogs/unreleased/blackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404.yml | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb index abc283d7aa9..6484a713f8e 100644 --- a/app/controllers/projects/artifacts_controller.rb +++ b/app/controllers/projects/artifacts_controller.rb @@ -7,6 +7,7 @@ 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! before_action :entry, only: [:file] @@ -101,4 +102,12 @@ 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 diff --git a/changelogs/unreleased/blackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404.yml b/changelogs/unreleased/blackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404.yml new file mode 100644 index 00000000000..fad15de2dd5 --- /dev/null +++ b/changelogs/unreleased/blackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404.yml @@ -0,0 +1,5 @@ +--- +title: "[Rails5] Set request.format for artifacts_controller" +merge_request: 19937 +author: "@blackst0ne" +type: fixed |