diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-11 08:46:53 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-18 08:32:17 -0500 |
| commit | 4945959b7c3c930778d1b88367d5e60fd06b52a0 (patch) | |
| tree | 34e5e9f9168ef40331fe7fa80cc7e8dfef2ca22e /app | |
| parent | 04c03d9d5ce1b6240ad0a7f500b2faeba453401e (diff) | |
| download | gitlab-ce-4945959b7c3c930778d1b88367d5e60fd06b52a0.tar.gz | |
Fix variable to show multiple pipelines for MR
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/merge_requests/_new_submit.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_pipelines.html.haml | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml index 3a670cb70dd..bfe461e6943 100644 --- 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 diff --git a/app/views/projects/merge_requests/show/_pipelines.html.haml b/app/views/projects/merge_requests/show/_pipelines.html.haml index db0ba88417b..afe3f3430c6 100644 --- a/app/views/projects/merge_requests/show/_pipelines.html.haml +++ b/app/views/projects/merge_requests/show/_pipelines.html.haml @@ -1 +1 @@ -= render "projects/commit/pipelines_list", pipelines: @pipeline, link_to_commit: true += render "projects/commit/pipelines_list", pipelines: @pipelines, link_to_commit: true |