diff options
| author | Minsik Yoon <yms9654@gmail.com> | 2015-10-22 09:55:35 +0900 |
|---|---|---|
| committer | 윤민식 <minsik.yoon@samsung.com> | 2015-11-13 16:53:53 +0900 |
| commit | 3d0efa8e0a359c84485a0fd7a3317745bf5648b8 (patch) | |
| tree | 6bcc5739a8bba9a1bea8d787f687a56f3f919bb3 /lib/gitlab | |
| parent | 23ed732e39d4e40e9a8643c015fd167b1e654470 (diff) | |
| download | gitlab-ce-3d0efa8e0a359c84485a0fd7a3317745bf5648b8.tar.gz | |
Add ignore white space option in merge request diff
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393).
Add ignore whitespace optoin to Commits Compare view
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/compare_result.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/compare_result.rb b/lib/gitlab/compare_result.rb index d72391dade5..0d696a1ee28 100644 --- a/lib/gitlab/compare_result.rb +++ b/lib/gitlab/compare_result.rb @@ -2,8 +2,8 @@ module Gitlab class CompareResult attr_reader :commits, :diffs - def initialize(compare) - @commits, @diffs = compare.commits, compare.diffs + def initialize(compare, diff_options = {}) + @commits, @diffs = compare.commits, compare.diffs(nil, diff_options) end end end |