diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-10-25 00:08:30 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-10-25 00:08:30 +0800 |
| commit | 78de8816f587bd90725e7b46fcbd3860d3eb2889 (patch) | |
| tree | b69e4b1f0ec8990e8d51360157b32e159c68469f | |
| parent | 517effe9f03ccd7b70ce7092b3295c9734060b39 (diff) | |
| download | gitlab-ce-78de8816f587bd90725e7b46fcbd3860d3eb2889.tar.gz | |
Also keep commits from source_project around, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6658#note_17190236
| -rw-r--r-- | app/models/merge_request_diff.rb | 8 |
1 files changed, 5 insertions, 3 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 |