diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-10-25 13:57:51 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-10-25 13:57:51 +0300 |
| commit | ba27abec815e476481b976175c67273c1cbb6e57 (patch) | |
| tree | ae3cb12e2147a48fbebabd383b03c06078f28467 /app | |
| parent | dd3b451d78e3db1e2b79229677d5af95b025bbc7 (diff) | |
| parent | ed545d9f754374c7a5fe98a81544f0d1cdc88cf0 (diff) | |
Merge branch 'show-commit-status-from-source-project' into 'master'
Show commits from source project. Be consistent with pipeline
## What does this MR do?
Show commits from source project instead of target project.
## Why was this MR needed?
To be consistent.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
- [x] Added for this feature/bug
## What are the relevant issue numbers?
Closes #3596
See merge request !6658
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request_diff.rb | 8 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_commits.html.haml | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index b8a10b7968e..dd65a9a8b86 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -299,8 +299,10 @@ class MergeRequestDiff < ActiveRecord::Base end def keep_around_commits - repository.keep_around(start_commit_sha) - repository.keep_around(head_commit_sha) - repository.keep_around(base_commit_sha) + [repository, merge_request.source_project.repository].each do |repo| + repo.keep_around(start_commit_sha) + repo.keep_around(head_commit_sha) + repo.keep_around(base_commit_sha) + end end end diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml index 0b05785430b..61020516bcf 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.source_project |