diff options
author | Sean McGivern <sean@gitlab.com> | 2016-06-30 16:17:10 +0100 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2016-07-08 10:57:21 +0100 |
commit | 78496e8c38ce0b415fa7aad5310b937a95265627 (patch) | |
tree | 6f6e31d2e1bd52918833bcf12e255a939d941f3a /app/helpers/diff_helper.rb | |
parent | b6b26692ea44cfeab7e8fd64b7df60852850fce2 (diff) | |
download | gitlab-ce-78496e8c38ce0b415fa7aad5310b937a95265627.tar.gz |
Disable overflow messages
With the option to expand and collapse individual diffs, these aren't
needed any more.
Diffstat (limited to 'app/helpers/diff_helper.rb')
-rw-r--r-- | app/helpers/diff_helper.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index d4655d60799..9a5920edfa2 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -37,16 +37,8 @@ module DiffHelper end end - def diff_hard_limit_enabled? - params[:force_show_diff].present? - end - def diff_options - options = { ignore_whitespace_change: hide_whitespace? } - if diff_hard_limit_enabled? - options.merge!(Commit.max_diff_options) - end - options + Commit.max_diff_options.merge(ignore_whitespace_change: hide_whitespace?) end def safe_diff_files(diffs, diff_refs: nil, repository: nil) |