diff options
| author | Michael Kozono <mkozono@gmail.com> | 2018-08-17 02:55:00 +0300 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2018-08-27 17:10:27 +0300 |
| commit | a9c4dec537ba1f53d37d8d3a24799956f878327d (patch) | |
| tree | ae03eb32baf8a7bf1a63ab812455071eef276c84 /app/models/merge_request_diff.rb | |
| parent | a0cfc1b65ec959e187a4297bcab0b494cbe52cce (diff) | |
Backport Repository#keep_around changes from EE to CE
Diffstat (limited to 'app/models/merge_request_diff.rb')
| -rw-r--r-- | app/models/merge_request_diff.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index d9393b4e545..bbe4f6f7969 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -314,9 +314,7 @@ class MergeRequestDiff < ActiveRecord::Base def keep_around_commits [repository, merge_request.source_project.repository].uniq.each do |repo| - repo.keep_around(start_commit_sha) - repo.keep_around(head_commit_sha) - repo.keep_around(base_commit_sha) + repo.keep_around(start_commit_sha, head_commit_sha, base_commit_sha) end end end |