diff options
author | Phil Hughes <me@iamphill.com> | 2016-06-08 13:37:39 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-06-10 12:07:51 +0100 |
commit | bd257c3d38a704e6fd2d020943d1a96bbfe97d6c (patch) | |
tree | f54d67e75f989f114e5ed58ccbb712d2a03485e4 | |
parent | a6345c14011e9ffa8cca45f9058a1529c7be5b62 (diff) | |
download | gitlab-ce-bd257c3d38a704e6fd2d020943d1a96bbfe97d6c.tar.gz |
Fixed merge conflict that caused tests to fail with build
-rw-r--r-- | app/views/projects/builds/_header.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
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 |