diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-03 16:22:59 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-03 16:22:59 +0200 |
| commit | 8a4f3193b54e19794be8cd7f91e9976237f0c1a9 (patch) | |
| tree | 0268752a0be164fad99c6b4150667ed7127a789d | |
| parent | 393ec8e74a328660b3d7eaafb25708bc1fa13ee3 (diff) | |
| parent | bf2bd2373d9179616436990b483aec52fcfe0f8e (diff) | |
| download | gitlab-ce-8a4f3193b54e19794be8cd7f91e9976237f0c1a9.tar.gz | |
Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2
* rename-ci-commit:
Fix merge_request handling
| -rw-r--r-- | app/views/projects/issues/_merge_requests.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml index 313c9433de2..75f36579b11 100644 --- a/app/views/projects/issues/_merge_requests.html.haml +++ b/app/views/projects/issues/_merge_requests.html.haml @@ -2,7 +2,7 @@ %h2.merge-requests-title = pluralize(@merge_requests.count, 'Related Merge Request') %ul.unstyled-list - - has_any_ci = @merge_requests.any?(&:ci_commit) + - has_any_ci = @merge_requests.any?(&:pipeline) - @merge_requests.each do |merge_request| %li %span.merge-request-ci-status |