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 /app/services/compare_service.rb | |
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 'app/services/compare_service.rb')
-rw-r--r-- | app/services/compare_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/compare_service.rb b/app/services/compare_service.rb index bfe6a3dc4be..ec581658fc1 100644 --- a/app/services/compare_service.rb +++ b/app/services/compare_service.rb @@ -3,7 +3,7 @@ require 'securerandom' # Compare 2 branches for one repo or between repositories # and return Gitlab::CompareResult object that responds to commits and diffs class CompareService - def execute(source_project, source_branch, target_project, target_branch) + def execute(source_project, source_branch, target_project, target_branch, diff_options = {}) source_commit = source_project.commit(source_branch) return unless source_commit @@ -25,7 +25,7 @@ class CompareService target_project.repository.raw_repository, target_branch, source_sha, - ) + ), diff_options ) end end |