diff options
| author | Paco Guzman <pacoguzmanp@gmail.com> | 2016-07-21 15:11:46 +0200 |
|---|---|---|
| committer | Paco Guzman <pacoguzmanp@gmail.com> | 2016-07-21 16:00:27 +0200 |
| commit | e223dc9260a64b3986ffefaf43201d6b0521c783 (patch) | |
| tree | a0433eb6deb9d23658f98c6f534d963913c7d75a /app/helpers/diff_helper.rb | |
| parent | 41a9fdbe0493382dd75d9dcc35ad445e4a22d088 (diff) | |
| download | gitlab-ce-20034-highlighted-diff-cached.tar.gz | |
Cache Highlighted Diff Lines when reload MR content20034-highlighted-diff-cached
Diffstat (limited to 'app/helpers/diff_helper.rb')
| -rw-r--r-- | app/helpers/diff_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index 75b029365f9..b2af1294fe6 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -30,7 +30,8 @@ module DiffHelper options[:paths] = params.values_at(:old_path, :new_path) end - Commit.max_diff_options.merge(options) + # Select truthy values those are the ones that makes a change + Commit.max_diff_options.merge(options).select { |_, v| v } end def safe_diff_files(diffs, diff_refs: nil, repository: nil) |