diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-07 22:59:30 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-07 22:59:30 +0000 |
| commit | 8b9cd3c072768ca810d2b33009e35d93a05e417f (patch) | |
| tree | 702515a306348f8146c3eb29419f6e591e954e10 /lib | |
| parent | f7cf2a7be6908ff577432a8c6b520a71361d4860 (diff) | |
| parent | 2f60a402d1fa98bb0090343f8180fc03b715467e (diff) | |
| download | gitlab-ce-8b9cd3c072768ca810d2b33009e35d93a05e417f.tar.gz | |
Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master'
Add support for commit diff ignore_whitespace_change and paths flags
Closes gitaly#198
See merge request !11028
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gitaly_client/commit.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client/commit.rb b/lib/gitlab/gitaly_client/commit.rb index 27db1e19bc1..0b001a9903d 100644 --- a/lib/gitlab/gitaly_client/commit.rb +++ b/lib/gitlab/gitaly_client/commit.rb @@ -32,7 +32,9 @@ module Gitlab request = Gitaly::CommitDiffRequest.new( repository: gitaly_repo, left_commit_id: parent_id, - right_commit_id: commit.id + right_commit_id: commit.id, + ignore_whitespace_change: options.fetch(:ignore_whitespace_change, false), + paths: options.fetch(:paths, []), ) Gitlab::Git::DiffCollection.new(stub.commit_diff(request), options) |