diff options
| author | Minsik Yoon <yms9654@gmail.com> | 2015-10-22 03:55:35 +0300 |
|---|---|---|
| committer | 윤민식 <minsik.yoon@samsung.com> | 2015-11-13 10:53:53 +0300 |
| commit | 3d0efa8e0a359c84485a0fd7a3317745bf5648b8 (patch) | |
| tree | 6bcc5739a8bba9a1bea8d787f687a56f3f919bb3 /app/controllers/projects/compare_controller.rb | |
| parent | 23ed732e39d4e40e9a8643c015fd167b1e654470 (diff) | |
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 'app/controllers/projects/compare_controller.rb')
| -rw-r--r-- | app/controllers/projects/compare_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb index 71aaad1fad6..55134e11d15 100644 --- a/app/controllers/projects/compare_controller.rb +++ b/app/controllers/projects/compare_controller.rb @@ -12,9 +12,10 @@ class Projects::CompareController < Projects::ApplicationController def show base_ref = Addressable::URI.unescape(params[:from]) @ref = head_ref = Addressable::URI.unescape(params[:to]) + diff_options = { ignore_whitespace_change: true } if params[:w] == '1' compare_result = CompareService.new. - execute(@project, head_ref, @project, base_ref) + execute(@project, head_ref, @project, base_ref, diff_options) if compare_result @commits = Commit.decorate(compare_result.commits, @project) |