diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-01 18:11:21 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-01 18:11:21 +0300 |
| commit | 202c100d5a1c7d363ad83d4de1dcd7d3b1a9a1b7 (patch) | |
| tree | 04c3554cea3ad3b6db713bfd102103f068d7d3bd /lib/gitlab/diff | |
| parent | 1134f540d223e1b7eed2b52abf2174d8712f26f8 (diff) | |
| parent | be8a320bd8594fe42c2558d2eab471acdbdc7321 (diff) | |
Merge branch 'osw-use-cached-highlighted-content-for-discussions' into 'master'
Use persisted diff data instead fetching Git on discussions
Closes #44052
See merge request gitlab-org/gitlab-ce!18657
Diffstat (limited to 'lib/gitlab/diff')
| -rw-r--r-- | lib/gitlab/diff/file_collection/base.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/diff/file_collection/base.rb b/lib/gitlab/diff/file_collection/base.rb index a6007ebf531..c79d8d3cb21 100644 --- a/lib/gitlab/diff/file_collection/base.rb +++ b/lib/gitlab/diff/file_collection/base.rb @@ -36,6 +36,8 @@ module Gitlab private def decorate_diff!(diff) + return diff if diff.is_a?(File) + Gitlab::Diff::File.new(diff, repository: project.repository, diff_refs: diff_refs, fallback_diff_refs: fallback_diff_refs) end end |