diff options
| author | Paco Guzman <pacoguzmanp@gmail.com> | 2016-07-27 19:00:34 +0200 |
|---|---|---|
| committer | Paco Guzman <pacoguzmanp@gmail.com> | 2016-08-03 07:00:20 +0200 |
| commit | c86c1905b5574cac234315598d8d715fcaee3ea7 (patch) | |
| tree | 31ba7ab51c04b07ea70d15db88f2370f9ca6359e /app/helpers/diff_helper.rb | |
| parent | 1d0c7b74920a94e488e6a2c090abb3e525438053 (diff) | |
| download | gitlab-ce-c86c1905b5574cac234315598d8d715fcaee3ea7.tar.gz | |
switch from diff_file_collection to diffs20034-safe-diffs
So we have raw_diffs too
Diffstat (limited to 'app/helpers/diff_helper.rb')
| -rw-r--r-- | app/helpers/diff_helper.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index 2abe24b78bf..cc7121b1163 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -23,10 +23,7 @@ module DiffHelper end def diff_options - options = Gitlab::Diff::FileCollection.default_options.merge( - ignore_whitespace_change: hide_whitespace?, - no_collapse: expand_all_diffs? - ) + options = { ignore_whitespace_change: hide_whitespace?, no_collapse: expand_all_diffs? } if action_name == 'diff_for_path' options[:no_collapse] = true |