diff options
| author | Paco Guzman <pacoguzmanp@gmail.com> | 2016-07-26 09:21:42 +0200 |
|---|---|---|
| committer | Paco Guzman <pacoguzmanp@gmail.com> | 2016-08-03 07:00:20 +0200 |
| commit | 8f359ea9170b984ad43d126e17628c31ac3a1f14 (patch) | |
| tree | ee47d5172537ddedabc2cc38ef3cb5bf966c89ee /app/helpers | |
| parent | cd7c2cb6ddd4d9c9f9bdae00c887c0022c121c17 (diff) | |
| download | gitlab-ce-8f359ea9170b984ad43d126e17628c31ac3a1f14.tar.gz | |
Move to Gitlab::Diff::FileCollection
Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/diff_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index 6497282af57..2abe24b78bf 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -23,7 +23,7 @@ module DiffHelper end def diff_options - options = SafeDiffs.default_options.merge( + options = Gitlab::Diff::FileCollection.default_options.merge( ignore_whitespace_change: hide_whitespace?, no_collapse: expand_all_diffs? ) |