diff options
author | Sean McGivern <sean@gitlab.com> | 2016-07-08 22:50:06 +0100 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2016-07-11 09:31:34 +0100 |
commit | 5266ae87c43a6760600e397257f9791d950dbe15 (patch) | |
tree | 83e840670b4c772020be590e5934586fe746df6e /app/helpers/diff_helper.rb | |
parent | e462e122784f40550c53224af5a58b201ed1fd8f (diff) | |
download | gitlab-ce-5266ae87c43a6760600e397257f9791d950dbe15.tar.gz |
Support renames in diff_for_path actions
Diffstat (limited to 'app/helpers/diff_helper.rb')
-rw-r--r-- | app/helpers/diff_helper.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index 04490226e50..e29f665baec 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -24,7 +24,11 @@ module DiffHelper def diff_options default_options = Commit.max_diff_options - default_options[:paths] = [params[:path]] if params[:path] + + if action_name == 'diff_for_path' + default_options[:paths] = params.values_at(:old_path, :new_path) + end + default_options.merge(ignore_whitespace_change: hide_whitespace?) end @@ -88,7 +92,7 @@ module DiffHelper def commit_for_diff(diff_file) return diff_file.content_commit if diff_file.content_commit - + if diff_file.deleted_file @base_commit || @commit.parent || @commit else |