From 5416d0e0837f69f35a3a9deaf947fd62e5293661 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Fri, 21 Oct 2016 16:22:43 +0800 Subject: Pass `@ref` along so we know which pipeline to show Closes #23615 --- app/views/projects/merge_requests/branch_from.html.haml | 2 +- app/views/projects/merge_requests/branch_to.html.haml | 2 +- app/views/projects/merge_requests/show/_commits.html.haml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app/views/projects/merge_requests') diff --git a/app/views/projects/merge_requests/branch_from.html.haml b/app/views/projects/merge_requests/branch_from.html.haml index 4f90dde6fa8..f99f1946a5e 100644 --- a/app/views/projects/merge_requests/branch_from.html.haml +++ b/app/views/projects/merge_requests/branch_from.html.haml @@ -1 +1 @@ -= commit_to_html(@commit, @source_project, false) += commit_to_html(@commit, @ref, @source_project) if @commit diff --git a/app/views/projects/merge_requests/branch_to.html.haml b/app/views/projects/merge_requests/branch_to.html.haml index 67a7a6bcec9..a8b3c5d950a 100644 --- a/app/views/projects/merge_requests/branch_to.html.haml +++ b/app/views/projects/merge_requests/branch_to.html.haml @@ -1 +1 @@ -= commit_to_html(@commit, @target_project, false) += commit_to_html(@commit, @ref, @target_project) if @commit diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml index 0b05785430b..b488f343214 100644 --- a/app/views/projects/merge_requests/show/_commits.html.haml +++ b/app/views/projects/merge_requests/show/_commits.html.haml @@ -3,4 +3,4 @@ Most recent commits displayed first %ol#commits-list.list-unstyled - = render "projects/commits/commits", project: @merge_request.project + = render "projects/commits/commits", project: @merge_request.project, ref: @merge_request.source_branch -- cgit v1.2.3