From ed51734030f94aa7e0636d8527b4bdae05c9de6b Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Tue, 21 Jun 2016 13:12:02 +0200 Subject: Handle error on trace raw download with old builds (DB stored) --- app/controllers/projects/builds_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/projects/builds_controller.rb') diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb index 12195c3cbb8..4127337cbf2 100644 --- a/app/controllers/projects/builds_controller.rb +++ b/app/controllers/projects/builds_controller.rb @@ -78,7 +78,7 @@ class Projects::BuildsController < Projects::ApplicationController end def raw - if @build.has_trace? + if @build.has_trace_file? send_file @build.path_to_trace, type: 'text/plain; charset=utf-8', disposition: 'inline' else render_404 -- cgit v1.2.1 From 77295de4076835d6080a9868fe7cb0c08522e141 Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Thu, 25 Aug 2016 13:53:49 +0200 Subject: Change 404 to 410 error when raw trace is unavailable --- app/controllers/projects/builds_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/projects/builds_controller.rb') diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb index 4127337cbf2..79d774195f8 100644 --- a/app/controllers/projects/builds_controller.rb +++ b/app/controllers/projects/builds_controller.rb @@ -81,7 +81,7 @@ class Projects::BuildsController < Projects::ApplicationController if @build.has_trace_file? send_file @build.path_to_trace, type: 'text/plain; charset=utf-8', disposition: 'inline' else - render_404 + render_410 end end -- cgit v1.2.1 From c8861da76772d781f677a76506f590edc23ba251 Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Tue, 30 Aug 2016 12:47:31 +0200 Subject: Update specs - add mocks to simulate old versions --- app/controllers/projects/builds_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/controllers/projects/builds_controller.rb') diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb index 79d774195f8..77934ff9962 100644 --- a/app/controllers/projects/builds_controller.rb +++ b/app/controllers/projects/builds_controller.rb @@ -79,9 +79,9 @@ class Projects::BuildsController < Projects::ApplicationController def raw if @build.has_trace_file? - send_file @build.path_to_trace, type: 'text/plain; charset=utf-8', disposition: 'inline' + send_file @build.trace_file_path, type: 'text/plain; charset=utf-8', disposition: 'inline' else - render_410 + render_404 end end -- cgit v1.2.1