summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2016-06-13 16:22:38 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2016-06-13 16:22:38 +0000
commitc928accd954e5812ccc7d2b0887028da554f2ef3 (patch)
treeeeaa083be74df376388d6f7738062b9080fbeae0
parent70672182d1e28ad0aea4339921f54044a3a83cb6 (diff)
parentc1f37964ed04e34fd8606d9b2a63f9d6798766f5 (diff)
downloadgitlab-ce-c928accd954e5812ccc7d2b0887028da554f2ef3.tar.gz
Merge branch 'fix-related-branches-error-500' into 'master'
Fix typo causing related branches to Error 500 From Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/6154/ See merge request !4611
-rw-r--r--app/views/projects/issues/_related_branches.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/issues/_related_branches.html.haml b/app/views/projects/issues/_related_branches.html.haml
index b9bb6fe559d..c6fc499a7b8 100644
--- a/app/views/projects/issues/_related_branches.html.haml
+++ b/app/views/projects/issues/_related_branches.html.haml
@@ -6,7 +6,7 @@
%li
- sha = @project.repository.find_branch(branch).target
- pipeline = @project.pipeline(sha, branch) if sha
- - if ci_copipelinemmit
+ - if pipeline
%span.related-branch-ci-status
= render_pipeline_status(pipeline)
%span.related-branch-info