summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-06 15:39:33 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-06 15:39:33 -0800
commitb55a0519acb34a764b2a350010aa813fd35b361e (patch)
tree53a43a972224684711b6a4bed59ab573c1dab71d
parent842f9e03a8b6c5e7a25381aeeafa35ef7d927c71 (diff)
downloadgitlab-ce-b55a0519acb34a764b2a350010aa813fd35b361e.tar.gz
Pass source project variable to commits list on MR page
-rw-r--r--app/views/projects/commits/_commits.html.haml2
-rw-r--r--app/views/projects/commits/show.html.haml2
-rw-r--r--app/views/projects/merge_requests/_new_submit.html.haml2
-rw-r--r--app/views/projects/merge_requests/show/_commits.html.haml2
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml
index d57659065a8..f279e3c37cd 100644
--- a/app/views/projects/commits/_commits.html.haml
+++ b/app/views/projects/commits/_commits.html.haml
@@ -7,5 +7,5 @@
%p= pluralize(commits.count, 'commit')
.col-md-10
%ul.bordered-list
- = render commits, project: @project
+ = render commits, project: project
%hr.lists-separator
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index 56956625e0b..b80639763c8 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -13,7 +13,7 @@
= commits_breadcrumbs
%div{id: dom_id(@project)}
- #commits-list= render "commits"
+ #commits-list= render "commits", project: @project
.clear
= spinner
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index 6c5875c7d42..ac374532ffd 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -94,7 +94,7 @@
%span.badge= @diffs.size
.commits.tab-content
- = render "projects/commits/commits"
+ = render "projects/commits/commits", project: @project
.diffs.tab-content
- if @diffs.present?
= render "projects/diffs/diffs", diffs: @diffs, project: @project
diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml
index ac214e687b8..3b7f283daf0 100644
--- a/app/views/projects/merge_requests/show/_commits.html.haml
+++ b/app/views/projects/merge_requests/show/_commits.html.haml
@@ -1 +1 @@
-= render "projects/commits/commits" \ No newline at end of file
+= render "projects/commits/commits", project: @merge_request.source_project