From bd257c3d38a704e6fd2d020943d1a96bbfe97d6c Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Wed, 8 Jun 2016 13:37:39 +0100 Subject: [PATCH] Fixed merge conflict that caused tests to fail with build --- app/views/projects/builds/_header.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/builds/_header.html.haml b/app/views/projects/builds/_header.html.haml index 46561249bb8..51b5bd9db42 100644 --- a/app/views/projects/builds/_header.html.haml +++ b/app/views/projects/builds/_header.html.haml @@ -3,7 +3,7 @@ Build %strong ##{@build.id} for commit - = link_to ci_status_path(@build.commit) do + = link_to ci_status_path(@build.pipeline) do %strong= @build.pipeline.short_sha from = link_to namespace_project_commits_path(@project.namespace, @project, @build.ref) do