diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-04 15:11:23 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-04 15:11:23 +0000 |
| commit | 8d3aee3636da5181ae94d23b47c6794b5610ab01 (patch) | |
| tree | 73236b3e4b5d103c926df08449b2071ec19e4d18 /app/models/merge_request_diff.rb | |
| parent | 98420be3dddf5a093c39d96a8ca109aa21d0eaf8 (diff) | |
| download | gitlab-ce-8d3aee3636da5181ae94d23b47c6794b5610ab01.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request_diff.rb')
| -rw-r--r-- | app/models/merge_request_diff.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 06a9a6ee873..b8a1575c180 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -164,7 +164,7 @@ class MergeRequestDiff < ApplicationRecord # hooks that run when an attribute was changed are run twice. reset - keep_around_commits + keep_around_commits unless importing? end def set_as_latest_diff |