Fix variable to show multiple pipelines for MR

4945959b · Annabel Dunstone Gray · 04c03d9d · 4945959b · 4945959b
Commit 4945959b authored Oct 11, 2016 by Annabel Dunstone Gray
2 changed files
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -18,7 +18,6 @@
  = f.hidden_field :target_branch

 .mr-compare.merge-request
-<<<<<<< 4a8cb230c6ba28ccdcd6da91855005e4fa0c46bf
  - if @commits.empty?
    .commits-empty
      %h4

--- a/app/views/projects/merge_requests/show/_pipelines.html.haml
+++ b/app/views/projects/merge_requests/show/_pipelines.html.haml
-= render "projects/commit/pipelines_list", pipelines: @pipeline, link_to_commit: true
+= render "projects/commit/pipelines_list", pipelines: @pipelines, link_to_commit: true