Commit e8b03baf authored by Lin Jen-Shin's avatar Lin Jen-Shin

Use path rather than URL because it should work for http 302:

Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_14035941
parent 4fbe044b
...@@ -35,10 +35,10 @@ class Projects::ArtifactsController < Projects::ApplicationController ...@@ -35,10 +35,10 @@ class Projects::ArtifactsController < Projects::ApplicationController
end end
def latest_succeeded def latest_succeeded
target_url = artifacts_action_url(params[:path], project, build) target_path = artifacts_action_path(params[:path], project, build)
if target_url if target_url
redirect_to(target_url) redirect_to(target_path)
else else
render_404 render_404
end end
......
...@@ -152,16 +152,16 @@ module GitlabRoutingHelper ...@@ -152,16 +152,16 @@ module GitlabRoutingHelper
# Artifacts # Artifacts
def artifacts_action_url(path, project, build) def artifacts_action_path(path, project, build)
args = [project.namespace, project, build] args = [project.namespace, project, build]
case path case path
when 'download' when 'download'
download_namespace_project_build_artifacts_url(*args) download_namespace_project_build_artifacts_path(*args)
when 'browse' when 'browse'
browse_namespace_project_build_artifacts_url(*args) browse_namespace_project_build_artifacts_path(*args)
when 'file' when 'file'
file_namespace_project_build_artifacts_url(*args) file_namespace_project_build_artifacts_path(*args)
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment