diff options
| author | Phil Hughes <me@iamphill.com> | 2016-09-05 09:38:37 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-09-05 09:38:37 +0100 |
| commit | c735c53aae8681d95584d921f12020774e4fd23c (patch) | |
| tree | b84be165a8ed1f95452253747d2f8d5a0ff6bbf3 /app/controllers/projects/builds_controller.rb | |
| parent | 85f6244ce852fb6b788ea660c7d0cbe14ec10a20 (diff) | |
| parent | fe3d94e8e2e3f5d54575a7f16440cc1711617d2b (diff) | |
| download | gitlab-ce-build-cancel-spinner.tar.gz | |
Merge branch 'master' into build-cancel-spinnerbuild-cancel-spinner
Diffstat (limited to 'app/controllers/projects/builds_controller.rb')
| -rw-r--r-- | app/controllers/projects/builds_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb index 12195c3cbb8..77934ff9962 100644 --- a/app/controllers/projects/builds_controller.rb +++ b/app/controllers/projects/builds_controller.rb @@ -78,8 +78,8 @@ class Projects::BuildsController < Projects::ApplicationController end def raw - if @build.has_trace? - send_file @build.path_to_trace, type: 'text/plain; charset=utf-8', disposition: 'inline' + if @build.has_trace_file? + send_file @build.trace_file_path, type: 'text/plain; charset=utf-8', disposition: 'inline' else render_404 end |